reactos/CMake
1
0
Fork 0
mirror of https://github.com/reactos/CMake.git synced 2025-03-04 18:07:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
36,300 Commits 4 Branches 185 Tags
Commit Graph

36300 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King
591557ba45 Merge topic 'file-generate-path-cleanup' 
c41a7c7d file: Normalize GENERATE command input and output file paths

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !940
 2017-06-09 10:36:30 -04:00
Brad King
20df0bcd70 Merge topic 'sdcc-simplify-link-flags' 
a0436a2f SDCC: Remove superfluous whitespace from link line
dcf559d0 SDCC: Do not explicitly ask linker to generate Intel Hex files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !942
 2017-06-09 10:34:42 -04:00
Brad King
b90330f574 Merge topic 'qt-pass-point-by-value' 
994beddb CMakeSetupDialog: Pass QPoint by value

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !946
 2017-06-09 10:34:06 -04:00
Brad King
7e6e37fdf1 Merge topic 'no-return-void-expression' 
5b02bcf6 QtDialog/FirstConfigure: remove 'return' from void expression
2d1c05c1 cmGlobalGenerator: remove 'return' from void expression

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !941
 2017-06-09 10:33:47 -04:00
Brad King
d4d24c30f0 Merge topic 'cpack-destructor-overrides' 
62eec34c Add CM_OVERRIDE to CPack generator destructors

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !939
 2017-06-09 10:33:18 -04:00
Brad King
9dd1d351fe Merge branch 'release-3.9' 2017-06-09 10:09:22 -04:00
Brad King
7150082aa8 Merge topic 'bootstrap-cleanup' 
83784ed1 bootstrap: remove leftover empty variable dereference

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !944
 2017-06-09 10:08:26 -04:00
Brad King
c8a866b8c4 Merge topic 'FindDoxygen-imported-target-once' 
522c92d7 FindDoxygen: Create imported targets at most once in a given scope

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !945
 2017-06-09 10:07:16 -04:00
Brad King
ae22079808 Merge branch 'FindDoxygen-imported-target-once' into release-3.9 2017-06-09 10:04:13 -04:00
Brad King
522c92d752 FindDoxygen: Create imported targets at most once in a given scope 
The imported targets added by commit v3.9.0-rc1~55^2 (Improve Doxygen
support, 2017-04-10) need to be guarded against duplicate creation on
multiple inclusion.
 2017-06-09 10:03:26 -04:00
Brad King
55d752b108 Merge topic 'improve-msvc-feature-checks' 
f44d9bcc C++ feature checks: Improve exclusion of "0 Warning(s)"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !938
 2017-06-09 10:00:57 -04:00
Kitware Robot
51e1e23cf4 CMake Nightly Date Stamp 2017-06-09 00:01:04 -04:00
Daniel Pfeifer
994beddb93 CMakeSetupDialog: Pass QPoint by value 2017-06-08 22:15:21 +02:00
Rolf Eike Beer
83784ed18b bootstrap: remove leftover empty variable dereference 
This was missed in 9c0d1e7531edbebc7943d5b981353b17631ed632 when the for loop
that used this as loop variable was removed.
 2017-06-08 21:19:25 +02:00
Reto Schneider
a0436a2f61 SDCC: Remove superfluous whitespace from link line 2017-06-08 13:19:49 -04:00
Reto Schneider
dcf559d060 SDCC: Do not explicitly ask linker to generate Intel Hex files 
The `--out-fmt-ihx` option added by commit v2.6.0~1253 (...use
--out-fmt-ihx to enforce .ihx files, 2007-08-15) may interfere with
options requested by the user.  Also, when no linker output is
specified, SDCC outputs Intel Hex by default anyway.
 2017-06-08 13:18:28 -04:00
Brad King
c41a7c7d90 file: Normalize GENERATE command input and output file paths 
Normalize absolute paths so that no extra components like `../` or
`...//...` appear that later confuse relative path computation.
In particular, we expect paths sent to AddCMakeDependFile and
AddCMakeOutputFile to be normalized.

Do this only for paths that are already absolute because
we can't handle relative paths yet (see #16786).

Fixes: #16892
 2017-06-08 10:41:28 -04:00
Daniel Pfeifer
5b02bcf682 QtDialog/FirstConfigure: remove 'return' from void expression 2017-06-08 16:40:57 +02:00
Daniel Pfeifer
2d1c05c166 cmGlobalGenerator: remove 'return' from void expression 2017-06-08 16:40:11 +02:00
Brad King
62eec34c29 Add CM_OVERRIDE to CPack generator destructors 2017-06-08 09:38:07 -04:00
Brad King
cab94b7c4f Merge topic 'bootstrap-cleanup' 
9c0d1e75 bootstrap: implement cmake_extract_standard_flags() without loop
567bac89 bootstrap: use "grep -q" instead of output redirection
380bd70c bootstrap: implement cmake_toupper() using tr
e61979a7 bootstrap: don't use 'cat x | sed', let sed open the file instead

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !937
 2017-06-08 09:25:52 -04:00
Brad King
43dae64597 Merge branch 'improve-msvc-feature-checks' into release-3.9 2017-06-08 09:23:05 -04:00
Brad King
f44d9bcc8f C++ feature checks: Improve exclusion of "0 Warning(s)" 
Simply matching "0 Warning" may match "10 Warning(s)".  Instead remove
the entire `    0 Warning(s)` content from the MSBuild output before
searching it for warnings.

Issue: #16942
 2017-06-08 09:22:09 -04:00
Brad King
2a83bffdb9 Merge topic 'suppress-false-positive-warning' 
488ffbef CTestCustom: Suppress warning matched on source file name

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !934
 2017-06-08 08:56:03 -04:00
Kitware Robot
bf06d72f39 CMake Nightly Date Stamp 2017-06-08 00:01:06 -04:00
Brad King
f203669bcc Merge branch 'release-3.9' 2017-06-07 14:31:54 -04:00
Rolf Eike Beer
9c0d1e7531 bootstrap: implement cmake_extract_standard_flags() without loop 
Pass all files to sed at once, and don't even change the directory for this.
 2017-06-07 19:52:40 +02:00
Rolf Eike Beer
567bac890c bootstrap: use "grep -q" instead of output redirection 2017-06-07 19:52:40 +02:00
Rolf Eike Beer
380bd70cc2 bootstrap: implement cmake_toupper() using tr 2017-06-07 19:52:40 +02:00
Rolf Eike Beer
e61979a71c bootstrap: don't use 'cat x | sed', let sed open the file instead 2017-06-07 19:52:40 +02:00
Brad King
b6e35578b6 Merge branch 'release-3.9' 2017-06-07 13:26:44 -04:00
Brad King
b8b8f0c0fd Merge topic 'FindDoxygen-compat' 
893ee1b1 FindDoxygen: Restore DOXYGEN_DOT_FOUND variable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !935
 2017-06-07 13:25:21 -04:00
Brad King
010b50fda7 CMake 3.9.0-rc2 v3.9.0-rc2 2017-06-07 13:05:16 -04:00
Brad King
1c6d03729a Merge branch 'FindDoxygen-compat' into release-3.9 2017-06-07 12:54:57 -04:00
Konstantin Podsvirov
893ee1b17c FindDoxygen: Restore DOXYGEN_DOT_FOUND variable 
The changes in commit v3.9.0-rc1~55^2 (Improve Doxygen support,
2017-04-10) accidentally dropped this variable from its compatibility
mode.
 2017-06-07 12:51:06 -04:00
Brad King
c8a8687bcb Merge topic 'revert-FindGTest-main-debug' 
ab2954c4 Revert "FindGTest: Add gtestd_main variant of debug library"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !936
 2017-06-07 12:42:04 -04:00
Brad King
bc5a252a7b Merge branch 'revert-FindGTest-main-debug' into release-3.9 2017-06-07 12:39:57 -04:00
Brad King
ab2954c471 Revert "FindGTest: Add gtestd_main variant of debug library" 
The reported variant turned out to be due to a local configuration
problem.

Issue: #16940
 2017-06-07 12:38:25 -04:00
Brad King
a10c3cc69f Merge branch 'release-3.9' 2017-06-07 11:11:17 -04:00
Brad King
d3f3759bfb Merge topic 'doc-3.9-find_dependency' 
137938e5 Help: Add 3.9 release note about find_dependency update

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !933
 2017-06-07 11:09:02 -04:00
Brad King
67c0b56e3c Merge topic 'autogen-no-vs-per-config' 
cc1b513d Autogen: Do not use per-config file suffixes with VS yet

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !932
 2017-06-07 11:08:13 -04:00
Brad King
488ffbef4f CTestCustom: Suppress warning matched on source file name 
The `WarningMessagesDialog.cxx` source file name is displayed by
MSVC in the compiler output, and the CTest launcher matches the
name as a warning line starting in "Warning".  Suppress this
false positive with a custom exception.
 2017-06-07 10:46:20 -04:00
Brad King
44e323ca92 Merge branch 'doc-3.9-find_dependency' into release-3.9 2017-06-07 10:14:45 -04:00
Matthew Woehlke
137938e5f0 Help: Add 3.9 release note about find_dependency update 2017-06-07 10:13:49 -04:00
Brad King
b9d411eb25 Merge branch 'autogen-no-vs-per-config' into release-3.9 2017-06-07 10:01:18 -04:00
Brad King
5b1d0aeffe Merge topic 'fix-vs2017-featuredetect' 
f4ce3962 C++ feature checks: Do not match "0 Warning(s)" as a warning

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !930
 2017-06-07 09:59:12 -04:00
Brad King
1ee7a4ec77 Merge topic 'FindGTest-main-debug' 
df18cd1d FindGTest: Add gtestd_main variant of debug library

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !931
 2017-06-07 09:56:44 -04:00
Brad King
0f0a4d43f4 Merge topic 'cmake_host_system_information-extend' 
e7869e80 cmake_host_system_information: Add more keywords

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !912
 2017-06-07 09:55:54 -04:00
Brad King
cc1b513df1 Autogen: Do not use per-config file suffixes with VS yet 
The change in commit v3.9.0-rc1~42^2~1 (Autogen: Per-config file
suffixes, 2017-05-15) broke Visual Studio builds because the generators
do not yet fully support per-config sources.  Disable the behavior on
Visual Studio generators for now.

Fixes: #16939
 2017-06-07 09:41:49 -04:00
Kitware Robot
9530f41029 CMake Nightly Date Stamp 2017-06-07 00:01:07 -04:00