mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-26 08:08:24 -05:00
Code Issues Packages Projects Releases Wiki Activity
52,703 Commits 2 Branches 401 Tags
a57c4eef76d623078fe7ff718951a71da000a499
Commit Graph

30560 Commits

Author SHA1 Message Date
Brad King 7981602368 Merge topic 'openbsd-defines' 
317a477283 OpenBSD: Fix system feature definitions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6000
 2021-04-14 11:04:30 -04:00
Rafael Sadowski 317a477283 OpenBSD: Fix system feature definitions 
Since commit f034b0f663 (CMake compilation: do not use compiler
extensions, 2020-03-14, v3.18.0-rc1~494^2), some sources explicitly
enable needed system APIs on some platforms using definitions like
`_POSIX_C_SOURCE` and `_XOPEN_SOURCE`.  Drop the definitions for
OpenBSD, which provides the POSIX APIs by default.
 2021-04-14 11:02:29 -04:00
Brad King 1f91cf3442 Merge topic 'add_custom_command-DEPFILE-genex' 
0c47b91fcc Genex: add_custom_command: DEPFILE supports genex

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5998
 2021-04-14 10:57:17 -04:00
Brad King af2ce59191 Merge topic 'vs-autouic-on-ui-file-change' 
a8d879cf45 Autogen: Add detection of UI file changes to the pre-build VS case
1876f2d03f Autogen: Move duplicated filename generation code into a function
087b717aef Autogen: Move duplicated executable dependency code into a function
0656bebeae Autogen: Rename the variable for UI files with UIC options

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5999
 2021-04-14 10:56:31 -04:00
Kitware Robot 156504fe75 CMake Nightly Date Stamp 2021-04-14 00:01:04 -04:00
Kitware Robot 4bfe724e81 CMake Nightly Date Stamp 2021-04-13 00:01:05 -04:00
Marc Chevrier 0c47b91fcc Genex: add_custom_command: DEPFILE supports genex 
This facility is very useful for 'Ninja Multi-Config' and required
as well for future support of DEPFILE in 'Xcode' and 'Visual Studio'
generators (#20286).
 2021-04-12 13:06:49 +02:00
Kitware Robot 43ecda68eb CMake Nightly Date Stamp 2021-04-12 00:01:08 -04:00
Kitware Robot b1c739ad8b CMake Nightly Date Stamp 2021-04-11 00:01:04 -04:00
Duncan Barber a8d879cf45 Autogen: Add detection of UI file changes to the pre-build VS case 
This is achieved by adding a rule file which carries the UI files as dependencies but performs no meaningful command. Its output path points to a timestamp file which is instead touched by the pre-build command that runs autogen. The rule file therefore triggers the build if any of the files have been changed more recently than the last autogen run.

Fixes: #17959
Fixes: #18741
 2021-04-10 18:40:22 +01:00
Duncan Barber 1876f2d03f Autogen: Move duplicated filename generation code into a function 2021-04-10 18:33:24 +01:00
Duncan Barber 087b717aef Autogen: Move duplicated executable dependency code into a function 2021-04-10 18:33:23 +01:00
Duncan Barber 0656bebeae Autogen: Rename the variable for UI files with UIC options 
Monitoring for UI file changes in the target sources will require keeping track of the files without options as well so this will improve clarity.
 2021-04-10 18:33:22 +01:00
Kitware Robot aa283fdba1 CMake Nightly Date Stamp 2021-04-10 00:01:04 -04:00
Kitware Robot eb62097dec CMake Nightly Date Stamp 2021-04-09 00:01:21 -04:00
Brad King 9765ccfa71 CMake 3.20.1 2021-04-08 08:00:50 -04:00
Brad King 21f0478ade Merge topic 'presets-optional-generator-and-builddir' 
06e6981336 cmake-presets: Make generator and binaryDir fields optional

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5946
 2021-04-08 07:49:56 -04:00
Brad King a0e5998bd6 Merge topic 'ctest-wait-verbosity' 
82e40607a4 ctest: Display test "WAITING" messages only in extra-verbose mode
80da23f2a2 Tests: Add RunCTest helper option to control CTest verbose flag

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !5990
 2021-04-08 07:49:05 -04:00
Kitware Robot 8ffd3b4946 CMake Nightly Date Stamp 2021-04-08 00:01:25 -04:00
Brad King b962b9cf1d Merge topic 'autouic-source-group-fixes' 
e8ddc1e268 Autogen: Fix a bug in setting the UIC source group
7f0151dc91 Help: Document the AUTOUIC_SOURCE_GROUP property
f6c47dd0b4 Help: Fix a typo in the AUTOGEN_SOURCE_GROUP help

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Alexey Edelev <alexey.edelev@qt.io>
Merge-request: !5978
 2021-04-07 08:45:06 -04:00
Kitware Robot a8b6b54239 CMake Nightly Date Stamp 2021-04-07 00:06:15 -04:00
friendlyanon 06e6981336 cmake-presets: Make generator and binaryDir fields optional 
In v3 of the presets, generator and buildDir can be omitted to fall
back to regular cmake behavior when these values are not explicitly
provided by the user.

Fixes: #21987
 2021-04-07 01:24:44 +02:00
Brad King 82e40607a4 ctest: Display test "WAITING" messages only in extra-verbose mode 
These messages are incidental scheduling output.  Avoid cluttering
the normal verbose output showing tests starting and finishing.
 2021-04-06 14:48:14 -04:00
Kitware Robot 5160204fc2 CMake Nightly Date Stamp 2021-04-06 00:01:30 -04:00
Kitware Robot 3d700254f4 CMake Nightly Date Stamp 2021-04-05 00:01:24 -04:00
Duncan Barber e8ddc1e268 Autogen: Fix a bug in setting the UIC source group 
If the relative path to a UI file was empty then the source group for the corresponding autogen header file would not apply because of a double slash in the path.
 2021-04-04 12:29:59 +01:00
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 049757b8a8 Merge topic 'genex-HOST_LINK-in-try_compile' into release-3.20 
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 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 fca5aa8b33 Merge topic 'CUDA-device-link' into release-3.20 
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 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
Brad King 369d5c2bcf Merge topic 'make-fix-deps-paths' into release-3.20 
1b346350af Makefiles dependencies: normalize windows paths

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5955
 2021-04-01 10:19:58 -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