mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-03-14 05:20:50 -05:00
Code Issues Packages Projects Releases Wiki Activity
52,563 Commits 2 Branches 393 Tags
20e90c08e3b1fa60b69442d384bcc236ff6f8a21
Commit Graph

30531 Commits

Author SHA1 Message Date
Kitware Robot
20e90c08e3 CMake Nightly Date Stamp 2021-04-04 00:01:11 -04:00
Kitware Robot
d904b74c9e CMake Nightly Date Stamp 2021-04-03 00:01:54 -04:00
Kitware Robot
55843b899e CMake Nightly Date Stamp 2021-04-02 00:01:22 -04:00
Brad King
1c399ca88c Merge topic 'cmake-presets-condition-regex' 
5ac8b923f5 CMakePresets.json: Add matches condition

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5963
 2021-04-01 10:26:12 -04:00
Brad King
6068e54dbd Merge topic 'genex-HOST_LINK-in-try_compile' 
6cf81efe7d Genex: $<HOST_LINK:> and $<DEVICE_LINK:> must be usable in try_compile

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5964
 2021-04-01 10:22:15 -04:00
Brad King
b362c0bb26 Merge topic 'CUDA-device-link' 
bb96984ec9 CUDA Device link: Ensure all link options are correctly formatted

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5962
 2021-04-01 10:21:11 -04:00
Brad King
dfa3a25060 Merge topic 'make-fix-deps-paths' 
1b346350af Makefiles dependencies: normalize windows paths

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5955
 2021-04-01 10:19:59 -04:00
Kitware Robot
a8d2f7f459 CMake Nightly Date Stamp 2021-04-01 00:01:23 -04:00
Marc Chevrier
6cf81efe7d Genex: $<HOST_LINK:> and $<DEVICE_LINK:> must be usable in try_compile 
Fixes: #22007
 2021-03-31 19:03:35 +02:00
Kyle Edwards
5ac8b923f5 CMakePresets.json: Add matches condition 2021-03-31 10:24:24 -04:00
Brad King
cda40a42f1 Merge topic 'update-kwsys' 
25ccb2c7c3 Merge branch 'upstream-KWSys' into update-kwsys
d0b9ffb630 KWSys 2021-03-30 (db93a594)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5960
 2021-03-31 09:27:58 -04:00
Marc Chevrier
bb96984ec9 CUDA Device link: Ensure all link options are correctly formatted 
Fixes: #21994
 2021-03-31 12:05:23 +02:00
Kitware Robot
d796948f44 CMake Nightly Date Stamp 2021-03-31 00:01:19 -04:00
Brad King
25ccb2c7c3 Merge branch 'upstream-KWSys' into update-kwsys 
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2021-03-30 (db93a594)
 2021-03-30 10:45:01 -04:00
Brad King
d9b8acd238 Merge topic 'ifw-depends-name-version-parsing' 
a43783a08d CPackIFW: Fix parsing of name and version in component DEPENDS
f536e6f3fb CPackIFW: Remove redundant variable assignment

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5929
 2021-03-30 09:56:31 -04:00
Brad King
e6a5799fa0 Merge topic 'multiple-L-labels' 
44ad3f0b7f ctest: Support multiple -L and -LE options to mean "AND"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Lars Bilke <larsbilke83@googlemail.com>
Merge-request: !5329
 2021-03-30 09:55:42 -04:00
Brad King
c0092247fe Merge topic 'ninja-automoc-cycle' into release-3.20 
ca7c76269b Tests: Add test for Ninja automoc dependency cyle
54ad3e4958 autogen: Don't include SKIP_AUTOMOC files in depfile

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Jörg Bornemann <joerg.bornemann@qt.io>
Acked-by: Craig Scott <craig.scott@crascit.com>
Merge-request: !5956
 2021-03-30 09:54:09 -04:00
Brad King
f14e19c053 Merge topic 'ninja-automoc-cycle' 
ca7c76269b Tests: Add test for Ninja automoc dependency cyle
54ad3e4958 autogen: Don't include SKIP_AUTOMOC files in depfile

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Jörg Bornemann <joerg.bornemann@qt.io>
Acked-by: Craig Scott <craig.scott@crascit.com>
Merge-request: !5956
 2021-03-30 09:54:09 -04:00
Brad King
1df75b171d Merge topic 'nmc-cc-no-output' into release-3.20 
6dd89529e8 Ninja Multi-Config: Fix crash on custom command config with no output
e21a80e97d Tests: Teach RunCMake to ignore incidental 'Recompacting log' ninja output

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !5950
 2021-03-30 09:50:48 -04:00
Brad King
efcdec9a19 Merge topic 'nmc-cc-no-output' 
6dd89529e8 Ninja Multi-Config: Fix crash on custom command config with no output
e21a80e97d Tests: Teach RunCMake to ignore incidental 'Recompacting log' ninja output

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !5950
 2021-03-30 09:50:48 -04:00
Marc Chevrier
1b346350af Makefiles dependencies: normalize windows paths 
Fixes: #21997
 2021-03-30 15:04:03 +02:00
Kitware Robot
2e77199030 CMake Nightly Date Stamp 2021-03-30 00:01:18 -04:00
Kyle Edwards
54ad3e4958 autogen: Don't include SKIP_AUTOMOC files in depfile 
SKIP_AUTOMOC files should not be included in moc processing, which
means they shouldn't be included in the depfile either. Remove them.

Fixes: #21977
 2021-03-29 15:17:11 -04:00
Brad King
6dd89529e8 Ninja Multi-Config: Fix crash on custom command config with no output 
With generator expressions in a custom command's `OUTPUT` and
`BYPRODUCTS`, it is possible to have no outputs at all for a particular
configuration.  Generate no rule in this case.

Fixes: #21989
 2021-03-29 09:56:43 -04:00
Brad King
94f6ac5b50 Merge topic 'SWIG' 
1d8e3a1e77 UseSWIG: Use standard library name conventions for csharp language

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5949
 2021-03-29 09:36:36 -04:00
Brad King
d212d91f14 Merge topic 'commands-file-permissions' into release-3.20 
769ff05483 Help: Clarify permission-related command options
900184616a Cleanup: Fix misspelt name of local C++ variable
635431a0c9 Tests: Check host platform instead of target for running stat
4ceb0ca59e Tests: Remove redundant files for configure_file() tests

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5945
 2021-03-29 09:32:09 -04:00
Brad King
75dd9b6c97 Merge topic 'commands-file-permissions' 
769ff05483 Help: Clarify permission-related command options
900184616a Cleanup: Fix misspelt name of local C++ variable
635431a0c9 Tests: Check host platform instead of target for running stat
4ceb0ca59e Tests: Remove redundant files for configure_file() tests

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5945
 2021-03-29 09:32:09 -04:00
Brad King
c4f8005454 Merge topic 'correct_arg_parsing' 
79d7bcaf40 cmCommandLineArgument: correctly compute next parse index

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5936
 2021-03-29 09:29:40 -04:00
Brad King
0e37e0d215 Merge topic 'correct_arg_parsing' into release-3.20 
79d7bcaf40 cmCommandLineArgument: correctly compute next parse index

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5936
 2021-03-29 09:29:39 -04:00
Kitware Robot
d5ab6a53ed CMake Nightly Date Stamp 2021-03-29 00:01:18 -04:00
Kitware Robot
699577e7b2 CMake Nightly Date Stamp 2021-03-28 00:01:11 -04:00
Adriaan de Groot
44ad3f0b7f ctest: Support multiple -L and -LE options to mean "AND" 
Fixes: #21087
 2021-03-28 12:04:05 +11:00
Kitware Robot
b22c800604 CMake Nightly Date Stamp 2021-03-27 00:01:17 -04:00
Craig Scott
a43783a08d CPackIFW: Fix parsing of name and version in component DEPENDS 
The DEPENDS or DEPENDENCIES arguments in a call to
cpack_ifw_configure_component() or cpack_ifw_configure_component_group()
specify a name and optionally a version constraint as a single string.
QtIFW also allows a colon (requires QtIFW 3.1 or later) or a hyphen to
separate the name and version. The version may optionally contain a
leading operator, with = being assumed when no operator is present.

The previous code was not handling : as a separator at all and was
erroneously dropping the version part when no operator was given.
Fix both of those non-conforming behaviors and also warn if trying
to use a hyphen in a name with a QtIFW version that isn't recent enough
to support it.

Fixes: #21697
 2021-03-27 07:44:00 +11:00
Marc Chevrier
1d8e3a1e77 UseSWIG: Use standard library name conventions for csharp language 
Fixes: #21542
 2021-03-26 16:27:18 +01:00
Brad King
18a2e86385 Merge topic 'project-is-top-level' 
96a7040107 project: Define variables indicating whether project is top level
3706e9c97c Help: Convert project() directory variables to a definition list

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Michael Hirsch <michael@scivision.dev>
Merge-request: !5938
 2021-03-26 09:47:29 -04:00
friendlyanon
96a7040107 project: Define variables indicating whether project is top level 
Define `PROJECT_IS_TOP_LEVEL` and `<PROJECT-NAME>_IS_TOP_LEVEL`.  The
latter is a STATIC cache entry just like other `<PROJECT-NAME>_*`
variables so that it is globally scoped.

Issue: #20310
Fixes: #21961
 2021-03-26 09:35:34 -04:00
Robert Maynard
79d7bcaf40 cmCommandLineArgument: correctly compute next parse index 
Fixes #21966

Correctly compute the next parse index for `ZeroOrOne` when
it is zero, and for OneOrMore.
 2021-03-26 09:34:46 -04:00
Brad King
e0c3b9268b Merge topic 'windows-long-path' 
2fe39dc306 cmake: Fix loading CMake sources from long paths on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5940
 2021-03-26 09:25:15 -04:00
Brad King
40b806ee96 Merge topic 'ninja-multi-long-custom-command' 
3b864b2583 Ninja Multi-Config: Include configs in long CC scripts

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5941
 2021-03-26 09:23:19 -04:00
Craig Scott
900184616a Cleanup: Fix misspelt name of local C++ variable 2021-03-26 22:17:57 +11:00
Kitware Robot
61fd90b90c CMake Nightly Date Stamp 2021-03-26 00:01:21 -04:00
Matt Jaeger
2fe39dc306 cmake: Fix loading CMake sources from long paths on Windows 
Pass a Windows extended path to the lexer so it can open long paths.
 2021-03-25 15:49:48 -04:00
Kyle Edwards
3b864b2583 Ninja Multi-Config: Include configs in long CC scripts 
Fixes: #21973
 2021-03-25 13:18:47 -04:00
Brad King
fde2347f98 Merge topic 'nsis-branding-trim-position' 
f226a1678f Merge branch 'master' into nsis-branding-trim-position
a6a5256395 CPack: Validate and document NSIS branding text trim positions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5928
 2021-03-25 10:23:25 -04:00
Kitware Robot
c0aa4244f5 CMake Nightly Date Stamp 2021-03-25 00:01:17 -04:00
Craig Scott
f536e6f3fb CPackIFW: Remove redundant variable assignment 
This was showing up in cppcheck results.
 2021-03-24 18:23:06 +11:00
Craig Scott
f226a1678f Merge branch 'master' into nsis-branding-trim-position 2021-03-24 16:35:49 +11:00
Craig Scott
a6a5256395 CPack: Validate and document NSIS branding text trim positions 2021-03-24 16:35:29 +11:00
Kitware Robot
88060f4717 CMake Nightly Date Stamp 2021-03-24 00:01:16 -04:00