summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'openbsd-defines'Brad King2021-04-144-10/+9
|\ | | | | | | | | | | | | 317a477283 OpenBSD: Fix system feature definitions Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6000
| * OpenBSD: Fix system feature definitionsRafael Sadowski2021-04-144-10/+9
| | | | | | | | | | | | | | | | 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.
| * CMake 3.20.1v3.20.1Brad King2021-04-081-1/+1
| |
| * Merge topic 'genex-HOST_LINK-in-try_compile' into release-3.20Brad King2021-04-011-2/+11
| |\ | | | | | | | | | | | | | | | | | | 6cf81efe7d Genex: $<HOST_LINK:> and $<DEVICE_LINK:> must be usable in try_compile Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5964
| * \ Merge topic 'CUDA-device-link' into release-3.20Brad King2021-04-011-8/+52
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | bb96984ec9 CUDA Device link: Ensure all link options are correctly formatted Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5962
| * \ \ Merge topic 'make-fix-deps-paths' into release-3.20Brad King2021-04-011-1/+13
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1b346350af Makefiles dependencies: normalize windows paths Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5955
* | \ \ \ Merge topic 'add_custom_command-DEPFILE-genex'Brad King2021-04-143-2/+22
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0c47b91fcc Genex: add_custom_command: DEPFILE supports genex Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5998
| * | | | | Genex: add_custom_command: DEPFILE supports genexMarc Chevrier2021-04-123-2/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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).
* | | | | | Merge topic 'vs-autouic-on-ui-file-change'Brad King2021-04-142-40/+80
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | Autogen: Add detection of UI file changes to the pre-build VS caseDuncan Barber2021-04-102-1/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | Autogen: Move duplicated filename generation code into a functionDuncan Barber2021-04-102-26/+23
| | | | | | |
| * | | | | | Autogen: Move duplicated executable dependency code into a functionDuncan Barber2021-04-101-10/+13
| | | | | | |
| * | | | | | Autogen: Rename the variable for UI files with UIC optionsDuncan Barber2021-04-102-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | CMake Nightly Date StampKitware Robot2021-04-141-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2021-04-131-1/+1
| |/ / / / / |/| | | | |
* | | | | | CMake Nightly Date StampKitware Robot2021-04-121-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2021-04-111-1/+1
|/ / / / /
* | | | | CMake Nightly Date StampKitware Robot2021-04-101-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2021-04-091-1/+1
| | | | |
* | | | | Merge topic 'presets-optional-generator-and-builddir'Brad King2021-04-084-24/+33
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 06e6981336 cmake-presets: Make generator and binaryDir fields optional Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5946
| * | | | | cmake-presets: Make generator and binaryDir fields optionalfriendlyanon2021-04-064-24/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | Merge topic 'ctest-wait-verbosity'Brad King2021-04-081-5/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | ctest: Display test "WAITING" messages only in extra-verbose modeBrad King2021-04-061-5/+5
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | These messages are incidental scheduling output. Avoid cluttering the normal verbose output showing tests starting and finishing.
* | | | | | CMake Nightly Date StampKitware Robot2021-04-081-1/+1
| | | | | |
* | | | | | Merge topic 'autouic-source-group-fixes'Brad King2021-04-071-1/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | Autogen: Fix a bug in setting the UIC source groupDuncan Barber2021-04-041-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | CMake Nightly Date StampKitware Robot2021-04-071-1/+1
| |/ / / / / |/| | | | |
* | | | | | CMake Nightly Date StampKitware Robot2021-04-061-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2021-04-051-1/+1
|/ / / / /
* | | | | CMake Nightly Date StampKitware Robot2021-04-041-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2021-04-031-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2021-04-021-1/+1
| | | | |
* | | | | Merge topic 'cmake-presets-condition-regex'Brad King2021-04-013-0/+50
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5ac8b923f5 CMakePresets.json: Add matches condition Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5963
| * | | | | CMakePresets.json: Add matches conditionKyle Edwards2021-03-313-0/+50
| | | | | |
* | | | | | Merge topic 'genex-HOST_LINK-in-try_compile'Brad King2021-04-011-2/+11
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 6cf81efe7d Genex: $<HOST_LINK:> and $<DEVICE_LINK:> must be usable in try_compile Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5964
| * | | | | Genex: $<HOST_LINK:> and $<DEVICE_LINK:> must be usable in try_compileMarc Chevrier2021-03-311-2/+11
| | |/ / / | |/| | | | | | | | | | | | | Fixes: #22007
* | | | | Merge topic 'CUDA-device-link'Brad King2021-04-011-8/+52
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | bb96984ec9 CUDA Device link: Ensure all link options are correctly formatted Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5962
| * | | | CUDA Device link: Ensure all link options are correctly formattedMarc Chevrier2021-03-311-8/+52
| |/ / / | | | | | | | | | | | | Fixes: #21994
| * | | Merge topic 'ninja-automoc-cycle' into release-3.20Brad King2021-03-302-3/+10
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * \ \ \ Merge topic 'nmc-cc-no-output' into release-3.20Brad King2021-03-301-0/+5
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | \ \ \ \ Merge topic 'make-fix-deps-paths'Brad King2021-04-011-1/+13
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 1b346350af Makefiles dependencies: normalize windows paths Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5955
| * | | | | Makefiles dependencies: normalize windows pathsMarc Chevrier2021-03-301-1/+13
| |/ / / / | | | | | | | | | | | | | | | Fixes: #21997
* | | | | CMake Nightly Date StampKitware Robot2021-04-011-1/+1
| |_|_|/ |/| | |
* | | | Merge topic 'update-kwsys'Brad King2021-03-312-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 25ccb2c7c3 Merge branch 'upstream-KWSys' into update-kwsys d0b9ffb630 KWSys 2021-03-30 (db93a594) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5960
| * | | | Merge branch 'upstream-KWSys' into update-kwsysBrad King2021-03-302-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By KWSys Upstream * upstream-KWSys: KWSys 2021-03-30 (db93a594)
* | | | | CMake Nightly Date StampKitware Robot2021-03-311-1/+1
|/ / / /
* | | | Merge topic 'ifw-depends-name-version-parsing'Brad King2021-03-301-33/+78
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | CPackIFW: Fix parsing of name and version in component DEPENDSCraig Scott2021-03-261-32/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | CPackIFW: Remove redundant variable assignmentCraig Scott2021-03-241-1/+1
| | | | | | | | | | | | | | | This was showing up in cppcheck results.
* | | | | Merge topic 'multiple-L-labels'Brad King2021-03-308-80/+162
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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