summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'cpackrpm-debuginfo-single-package-install-erase-scripts'Brad King2021-04-017-2/+51
|\ | | | | | | | | | | | | 31c184ad69 CPackRPM: handle scripts in debuginfo single package mode Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5953
| * CPackRPM: handle scripts in debuginfo single package modeDomen Vrankar2021-03-307-2/+51
| | | | | | | | | | | | | | | | Enabling CPACK_RPM_DEBUGINFO_SINGLE_PACKAGE while using rpm install or erase scripts resulted in resulted missing scripts for non default components. Fixes: #21974
* | Merge branch 'release-3.20'Brad King2021-04-010-0/+0
|\ \
| * \ Merge branch 'release-3.19' into release-3.20Brad King2021-04-010-0/+0
| |\ \
* | \ \ Merge branch 'release-3.19'Brad King2021-04-010-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'doc-CMAKE_APPLE_SILICON_PROCESSOR' into release-3.19Brad King2021-04-011-3/+2
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !5965
* | \ \ \ Merge branch 'release-3.20'Brad King2021-04-010-0/+0
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge topic 'doc-CMAKE_APPLE_SILICON_PROCESSOR' into release-3.20Brad King2021-04-011-3/+2
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | 3f04f69733 Help: CMAKE_APPLE_SILICON_PROCESSOR cannot be set in a toolchain file Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5965
* | | | | Merge topic 'doc-CMAKE_APPLE_SILICON_PROCESSOR'Brad King2021-04-011-3/+2
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | 3f04f69733 Help: CMAKE_APPLE_SILICON_PROCESSOR cannot be set in a toolchain file Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5965
| * | | | Help: CMAKE_APPLE_SILICON_PROCESSOR cannot be set in a toolchain fileBrad King2021-04-011-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `CMakeDetermineSystem` determines the host system information before loading the toolchain file. Issue: #22012
* | | | | Merge branch 'release-3.20'Brad King2021-04-010-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge topic 'genex-HOST_LINK-in-try_compile' into release-3.20Brad King2021-04-015-2/+31
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'genex-HOST_LINK-in-try_compile'Brad King2021-04-015-2/+31
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-315-2/+31
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: #22007
* | | | | | Merge branch 'release-3.20'Brad King2021-04-010-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge topic 'CUDA-device-link' into release-3.20Brad King2021-04-015-8/+72
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bb96984ec9 CUDA Device link: Ensure all link options are correctly formatted Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5962
* | \ \ \ \ \ Merge topic 'CUDA-device-link'Brad King2021-04-015-8/+72
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-315-8/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #21994
* | | | | | | Merge branch 'release-3.20'Brad King2021-04-010-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | 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 '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 branch 'release-3.20'Brad King2021-03-310-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge topic 'cray-version-patch' into release-3.20Brad King2021-03-311-0/+3
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 258faaeef6 Cray: Detect Fortran compiler version patch level if available Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5957
* | \ \ \ \ \ \ Merge topic 'cray-version-patch'Brad King2021-03-311-0/+3
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 258faaeef6 Cray: Detect Fortran compiler version patch level if available Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5957
| * | | | | | | Cray: Detect Fortran compiler version patch level if availableJustin LaPolla2021-03-311-0/+3
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Fixes: #21969
* | | | | | | Merge topic 'cpackrpm-single-package-handling-empty-dir'Brad King2021-03-313-3/+12
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d0adb2386a CPackRPM: correctly handle empty dir in single package mode Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5951
| * | | | | | | CPackRPM: correctly handle empty dir in single package modeDomen Vrankar2021-03-283-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enabling CPACK_RPM_DEBUGINFO_SINGLE_PACKAGE while having an empty directory in non main component resulted in packaging error that the directory does not exist. Fixes: #21951
* | | | | | | | 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)
| | * | | | | | | KWSys 2021-03-30 (db93a594)KWSys Upstream2021-03-302-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit db93a5948e331c8920ac701e35b2f7e283646cae (master). Upstream Shortlog ----------------- Lemures Lemniscati (2): 9a6d6c54 Terminal: Avoid using Windows functions on Cygwin 4c61b968 SystemTools::FileIsFullPath: Do not accept Windows paths on Cygwin
* | | | | | | | | Merge branch 'release-3.20'Brad King2021-03-310-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | Merge topic 'android-binutils' into release-3.20Brad King2021-03-313-50/+52
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 61e6fc26bc Android: Fix search for binutils Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5958
* | | | | | | | | Merge topic 'android-binutils'Brad King2021-03-313-50/+52
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 61e6fc26bc Android: Fix search for binutils Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5958
| * | | | | | | | Android: Fix search for binutilsHaibo Huang2021-03-303-50/+52
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set `CMAKE_SYSTEM_PROGRAM_PATH` in `Platform/Android-Initialize` instead of `Platform/Android` so it can be used in `CMakeFindBinUtils`. Also add the names `llvm-strip` and `llvm-ranlib` for the corresponding tools.
* | | | | | | | CMake Nightly Date StampKitware Robot2021-03-311-1/+1
| |/ / / / / / |/| | | | | |
* | | | | | | Merge topic 'ifw-depends-name-version-parsing'Brad King2021-03-303-33/+95
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-263-32/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-3014-82/+222
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | ctest: Support multiple -L and -LE options to mean "AND"Adriaan de Groot2021-03-2814-82/+222
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #21087
* | | | | | | | | Merge branch 'release-3.20'Brad King2021-03-300-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Merge topic 'ninja-automoc-cycle' into release-3.20Brad King2021-03-308-20/+61
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'ninja-automoc-cycle'Brad King2021-03-308-20/+61
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | Tests: Add test for Ninja automoc dependency cyleKyle Edwards2021-03-296-17/+51
| | | | | | | | | |
| * | | | | | | | | autogen: Don't include SKIP_AUTOMOC files in depfileKyle Edwards2021-03-292-3/+10
| | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | Merge branch 'release-3.20'Brad King2021-03-300-0/+0
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge topic 'GNUInstallDirs-doc' into release-3.20Brad King2021-03-301-1/+4
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 06171fd7aa GNUInstallDirs: Clarify that CMAKE_INSTALL_<dir> may be absolute Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5947
* | \ \ \ \ \ \ \ \ Merge topic 'GNUInstallDirs-doc'Brad King2021-03-301-1/+4
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 06171fd7aa GNUInstallDirs: Clarify that CMAKE_INSTALL_<dir> may be absolute Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5947
generated by cgit v0.12 at 2025-09-06 06:57:08 (GMT)