mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-01 03:11:08 -06:00
Code Issues Packages Projects Releases Wiki Activity
36,301 Commits 2 Branches 385 Tags
fcbecbd2afcf3fcfd4662946615fec5e4c73ed84
Commit Graph

22935 Commits

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
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
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
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
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
Kitware Robot
bf06d72f39 CMake Nightly Date Stamp 2017-06-08 00:01:06 -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
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
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
Walter Gray
f4ce396254 C++ feature checks: Do not match "0 Warning(s)" as a warning 
The change in commit v3.9.0-rc1~6^2~1 (C++ feature checks: check output
for '[Ww]arning', 2017-06-03) accidentally matches `0 Warning(s)` in the
output and always thinks a warning exists, thus failing all checks in
Visual Studio builds.

Fixes: #16942
 2017-06-06 08:55:43 -04:00
Kitware Robot
1c9ff4a964 CMake Nightly Date Stamp 2017-06-06 00:01:06 -04:00
Florian Maushart
e7869e80ce cmake_host_system_information: Add more keywords 
Extend the `cmake_host_system_information()` command to add processor
identification keywords.
 2017-06-05 13:51:30 -04:00
Brad King
c095e90f3a Begin post-3.9 development 2017-06-05 10:41:19 -04:00
Brad King
344f9ed96a CMake 3.9.0-rc1 version update 2017-06-05 10:32:40 -04:00
Brad King
c6ea3f01c3 Merge topic 'lint-function-args' 
b1ec5dea Pass large types by const&, small types by value

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !927
 2017-06-05 09:44:24 -04:00
Brad King
8a68a2ceb3 Merge topic 'cm_fallthrough' 
8d7b3ef5 Provide and use CM_FALLTHROUGH
0068224f C++ feature checks: check output for '[Ww]arning'

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !924
 2017-06-05 09:43:51 -04:00
Brad King
5875140c57 Merge topic 'display-ctest-disabled' 
f59d729c ctest: Display disabled status when ctest -N is called

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Craig Scott <craig.scott@crascit.com>
Merge-request: !923
 2017-06-05 09:41:53 -04:00
Kitware Robot
1fa165359f CMake Nightly Date Stamp 2017-06-05 00:01:03 -04:00
Kitware Robot
7ff29fb379 CMake Nightly Date Stamp 2017-06-04 00:01:04 -04:00
Daniel Pfeifer
b1ec5deaf1 Pass large types by const&, small types by value 2017-06-04 00:48:21 +02:00
Daniel Pfeifer
8d7b3ef5d4 Provide and use CM_FALLTHROUGH 2017-06-03 08:38:51 +02:00
Daniel Pfeifer
0068224fdd C++ feature checks: check output for '[Ww]arning' 2017-06-03 08:38:51 +02:00
Kitware Robot
422c67e4f7 CMake Nightly Date Stamp 2017-06-03 00:01:05 -04:00
Chuck Atkins
f59d729c7c ctest: Display disabled status when ctest -N is called 2017-06-02 12:56:31 -04:00
Brad King
78d1a2d0bb Merge topic 'string-npos-cleanup' 
db2d46e2 Remove second arg: npos in substr usages
8b6f439e Access string npos without instance
389ed56f cmLocalUnixMakefileGenerator3: Remove unnecessary local variable
9fe4a9e2 cmParseBlanketJSCoverage: Pass unmodified parameter as const&

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !905
 2017-06-02 09:19:37 -04:00
Brad King
0a082be800 Merge topic 'update-kwsys' 
594a9fcf Merge branch 'upstream-KWSys' into update-kwsys
74ef363d KWSys 2017-06-01 (8243fefa)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !922
 2017-06-02 09:18:41 -04:00
Kitware Robot
2088ca0ca0 CMake Nightly Date Stamp 2017-06-02 00:01:05 -04:00
Pavel Solodovnikov
db2d46e2dd Remove second arg: npos in substr usages 2017-06-01 14:19:52 -04:00
Pavel Solodovnikov
8b6f439ef2 Access string npos without instance 2017-06-01 14:19:51 -04:00
Brad King
389ed56f63 cmLocalUnixMakefileGenerator3: Remove unnecessary local variable 2017-06-01 14:18:54 -04:00
Brad King
9fe4a9e2ae cmParseBlanketJSCoverage: Pass unmodified parameter as const& 2017-06-01 14:18:54 -04:00
Brad King
594a9fcf6f Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2017-06-01 (8243fefa)
 2017-06-01 14:07:35 -04:00
Brad King
6a42b9609f Merge topic 'ninja-mingw' 
82badfff Ninja: Fix CMP0058 on MinGW
c5ff50fc Tests: Fix CustomCommandByproducts regex for phony rules

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !919
 2017-06-01 14:00:58 -04:00
Brad King
75850db667 Merge topic 'update-kwsys' 
5e9bd8a2 Merge branch 'upstream-KWSys' into update-kwsys
50988f6d KWSys 2017-05-31 (bd0bbad7)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !915
 2017-06-01 13:34:11 -04:00
Kitware Robot
09e10f0937 CMake Nightly Date Stamp 2017-06-01 00:01:06 -04:00
Brad King
82badfffc3 Ninja: Fix CMP0058 on MinGW 
For CMP0058 we identify dependencies that have no rules to generate them
by collecting a set of all dependencies and a set of all files CMake
knows are generated by something, and then computing a set difference.
Fix construction of these sets to use the same form for each path.
This is after ConvertToNinjaPath but before EncodePath.

Without this, the slash conversion done by EncodePath for the GNU
compiler on Windows results in a mismatch, triggering an incorrect
CMP0058 warning.
 2017-05-31 13:44:16 -04:00
Brad King
5e9bd8a2ea Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2017-05-31 (bd0bbad7)
 2017-05-31 09:11:14 -04:00
Brad King
de16ff3e58 Merge topic 'ninja-mingw' 
6a2f8335 Ninja: Fix escaping of path to depfile
781eb380 Tests: Fix VSResource test on MinGW with Ninja and a space in the path

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !911
 2017-05-31 08:55:44 -04:00
Brad King
47281310bf Merge topic 'minor-cleanups' 
ed77c5c5 cmQtAutoGeneratorInitializer: Remove unused local variable
b398e716 cmVisualStudio10TargetGenerator: Remove shadowing local variable
da2330bd cmVisualStudio10ToolsetOptions: Remove unused include

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !910
 2017-05-31 08:54:51 -04:00
Kitware Robot
b3379e63e0 CMake Nightly Date Stamp 2017-05-31 00:01:08 -04:00
Brad King
6a2f833563 Ninja: Fix escaping of path to depfile 
Replace the dedicated and non-portable escaping code with use of our
standard escaping logic.
 2017-05-30 15:30:43 -04:00