summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* FindIconv: Add version supportSibi Siddharthan2021-02-252-1/+47
| | | | Issue: #21857
* Merge topic 'cpack_nsis_executable_custom'Brad King2021-02-233-1/+15
|\ | | | | | | | | | | | | 8e8b99d01a CPack/NSIS: Add option for setting custom makensis executable Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5839
| * CPack/NSIS: Add option for setting custom makensis executableJohnny Jazeix2021-02-223-1/+15
| | | | | | | | | | | | It allows users to set a custom one without changing the PATH environment variable. Fixes: #21733
* | Merge branch 'release-3.20'Brad King2021-02-230-0/+0
|\ \
| * \ Merge topic 'test-ExternalProject-CONFIGURE_HANDLED_BY_BUILD' into release-3.20Brad King2021-02-231-2/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | 74fe16a292 Tests: Fix ExternalProject CONFIGURE_HANDLED_BY_BUILD on 1s filesystems Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5838
* | \ \ Merge topic 'test-ExternalProject-CONFIGURE_HANDLED_BY_BUILD'Brad King2021-02-231-2/+2
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | 74fe16a292 Tests: Fix ExternalProject CONFIGURE_HANDLED_BY_BUILD on 1s filesystems Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5838
| * | | Tests: Fix ExternalProject CONFIGURE_HANDLED_BY_BUILD on 1s filesystemsDaan De Meyer2021-02-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Following commit 7155e358c9 (ExternalProject: Add CONFIGURE_HANDLED_BY_BUILD option, 2020-12-16, v3.20.0-rc1~168^2), modify the CONFIGURE_HANDLED_BY_BUILD test to sleep 1.125 seconds to make sure the file timestamp is always updated regardless of the resolution of the underlying filesystem. Fixes: #21830
* | | | Merge branch 'release-3.20'Brad King2021-02-230-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge topic 'test-macos-arm64' into release-3.20Brad King2021-02-2311-19/+58
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1c15eb39d2 Tests: Suppress failures on macOS arm64 due to separate Xcode signing phase 92418ac0ef Tests: Fix CTestTestCrash expected output on macOS arm64 8b22d9b3c3 Tests: Remove explicit no-signing marks from BundleTest 483db3de56 Tests: Clarify internal project name in RunCMake.GoogleTest cases Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5846
* | \ \ \ Merge topic 'test-macos-arm64'Brad King2021-02-2311-19/+58
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1c15eb39d2 Tests: Suppress failures on macOS arm64 due to separate Xcode signing phase 92418ac0ef Tests: Fix CTestTestCrash expected output on macOS arm64 8b22d9b3c3 Tests: Remove explicit no-signing marks from BundleTest 483db3de56 Tests: Clarify internal project name in RunCMake.GoogleTest cases Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5846
| * | | | Tests: Suppress failures on macOS arm64 due to separate Xcode signing phaseBrad King2021-02-228-0/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some tests fail because Xcode runs `POST_BUILD` commands before signing the binaries they run. Tell the linker to perform ad-hoc codesign even though Xcode normally tells it not to. Other tests fail because `install_name_tool` does not revise ad-hoc signatures without the codesign `linker-signed` flag. Add that flag ourselves where needed by our tests. For now these changes help our test suite pass so we can use it to cover everything else. Both of these cases may need further investigation to update CMake to help projects in general. Issue: #21845, #21854
| * | | | Tests: Fix CTestTestCrash expected output on macOS arm64Brad King2021-02-221-1/+1
| | | | |
| * | | | Tests: Remove explicit no-signing marks from BundleTestBrad King2021-02-223-14/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These were added by commit e29a92f525 (Xcode: Make BundleTests compatible with Xcode 11, 2019-09-01, v3.16.0-rc1~158^2). The real problem is that the `.app` is constructed with text files under the `.app/Contents/MacOS/` folder. Move those, and drop the special no-signing configuration.
| * | | | Tests: Clarify internal project name in RunCMake.GoogleTest casesBrad King2021-02-224-4/+4
| | | | |
* | | | | Merge branch 'release-3.20'Brad King2021-02-230-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge topic 'cmake-gui-restore-search' into release-3.20Brad King2021-02-232-0/+10
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 134d69121e cmake-gui: Restore search bar for cache view and environment dialog Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5845
* | \ \ \ \ Merge topic 'cmake-gui-restore-search'Brad King2021-02-232-0/+10
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 134d69121e cmake-gui: Restore search bar for cache view and environment dialog Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5845
| * | | | | cmake-gui: Restore search bar for cache view and environment dialogSankhesh Jhaveri2021-02-222-0/+10
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | This was broken by commit f1de6f6682 (cmake-gui: Support building against Qt6, 2020-12-17, v3.20.0-rc1~205^2~7). Fixes: #21850
* | | | | Merge branch 'release-3.20'Brad King2021-02-230-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge topic 'nag-fortran-include-moddir' into release-3.20Brad King2021-02-231-0/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ec030877a2 NAG: Fix using Fortran modules from their output directory Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5842
* | \ \ \ \ Merge topic 'nag-fortran-include-moddir'Brad King2021-02-231-0/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | ec030877a2 NAG: Fix using Fortran modules from their output directory Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5842
| * | | | | NAG: Fix using Fortran modules from their output directoryBrad King2021-02-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The NAG Fortran compiler's `-mdir` flag sets the module output directory but does not add the directory to the search path for using modules. This is inconsistent with other compilers like the GNU Fortran compiler's `-J` flag that does both. In order to make these consistent, add the module output directory with a `-I` flag on the NAG Fortran compiler so that it will be searched when using modules too. We already do this for the XL Fortran compiler since commit 210b0b99a9 (XL: Fix using Fortran modules from their output directory, 2020-02-28, v3.18.0-rc1~640^2~1).
* | | | | | Merge branch 'release-3.20'Brad King2021-02-230-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge topic 'per-config-autogen-info-file' into release-3.20Brad King2021-02-232-4/+4
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | a3df25c694 Autogen: Don't change the order of HEADERS array in AutogenInfo.json Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5840
* | | | | | Merge topic 'per-config-autogen-info-file'Brad King2021-02-232-4/+4
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | a3df25c694 Autogen: Don't change the order of HEADERS array in AutogenInfo.json Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5840
| * | | | | Autogen: Don't change the order of HEADERS array in AutogenInfo.jsonCraig Scott2021-02-222-4/+4
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt6 reads our internal AutogenInfo.json file. In 92d7b456e5 (Autogen: Add support for per-config sources, 2020-10-20), the ordering of the HEADERS array elements was changed and this broke their cmake_automoc_parser. We don't need to change the order of the array elements, we can append to the existing ones instead. Do this to allow their cmake_automoc_parser to continue to work. Fixes: #21823
* | | | | CMake Nightly Date StampKitware Robot2021-02-231-1/+1
| | | | |
* | | | | Merge branch 'release-3.20'Brad King2021-02-220-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge topic 'fix-IS_NEWER_THAN-usage' into release-3.20Brad King2021-02-228-6/+111
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b0da671243 FetchContent: Don't update timestamps if files don't change 404cddb7bb ExternalProject: Fix misuse of IS_NEWER_THAN in timestamp checks Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5825
* | \ \ \ \ Merge topic 'fix-IS_NEWER_THAN-usage'Brad King2021-02-2211-17/+127
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 300a471245 Merge branch 'backport-FetchContent-timestamps' into fix-IS_NEWER_THAN-usage 8c93e3232f GoogleTest: Fix misuse of IS_NEWER_THAN in timestamp check 28501fca94 PCH PDB: Fix misuse of IS_NEWER_THAN in timestamp check d7c8030541 FortranCInterface: Fix misuse of IS_NEWER_THAN in timestamp check b0da671243 FetchContent: Don't update timestamps if files don't change 404cddb7bb ExternalProject: Fix misuse of IS_NEWER_THAN in timestamp checks Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5825
| * \ \ \ \ \ Merge branch 'backport-FetchContent-timestamps' into fix-IS_NEWER_THAN-usageBrad King2021-02-228-6/+111
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | FetchContent: Don't update timestamps if files don't changeCraig Scott2021-02-226-4/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The refactoring in 17e5516e60 (FetchContent: Invoke steps directly and avoid a separate sub-build, 2021-01-29) uses a different way of writing out the step scripts and updating time stamps when steps are executed. That inadvertently always wrote out the scripts for custom commands, even when the contents didn't change. This caused their timestamp to always be updated, resulting in those steps always being seen as out-of-date and needing to be re-executed. The way timestamps were checked to determine whether to re-execute a step also did not adequately account for file systems which only have second-resolution timestamps. The IS_NEWER_THAN if condition also returns true when timestamps are the same, so one needs to use the negative form to get a true "is newer than" test. ExternalProject is not susceptible to this problem because it uses file(GENERATE) to write out the script files and that only updates the file's timestamp if the contents change. It also mostly leaves timestamp checking to the build tool.
| | * | | | | ExternalProject: Fix misuse of IS_NEWER_THAN in timestamp checksCraig Scott2021-02-222-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using a file system which only has second resolution timestamps, there is a reasonably high likelihood of timestamps being the same. The IS_NEWER_THAN test returns true when timestamps are the same, so don't redo downloads when they match exactly.
| * | | | | | GoogleTest: Fix misuse of IS_NEWER_THAN in timestamp checkCraig Scott2021-02-221-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using a file system which only has second resolution timestamps, there is a reasonably high likelihood of timestamps being the same. The IS_NEWER_THAN test returns true when timestamps are the same, so don't redo test discovery when they match exactly.
| * | | | | | PCH PDB: Fix misuse of IS_NEWER_THAN in timestamp checkCraig Scott2021-02-221-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using a file system which only has second resolution timestamps, there is a reasonably high likelihood of timestamps being the same. The IS_NEWER_THAN test returns true when timestamps are the same, so don't retry copying the PCH PDB file when they match exactly.
| * | | | | | FortranCInterface: Fix misuse of IS_NEWER_THAN in timestamp checkCraig Scott2021-02-221-8/+11
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using a file system which only has second resolution timestamps, there is a reasonably high likelihood of timestamps being the same. The IS_NEWER_THAN test returns true when timestamps are the same, so don't redo detection when they match exactly.
* | | | | | Merge branch 'release-3.20'Brad King2021-02-220-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge topic 'vs-pch-one-lang' into release-3.20Brad King2021-02-226-7/+44
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9945b3b565 VS: Restore support for PCH in CXX but not C within once target d9fd32b3b3 cmVisualStudio10TargetGenerator: Refactor per-source PCH logic Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5836
* | \ \ \ \ \ Merge topic 'vs-pch-one-lang'Brad King2021-02-226-7/+44
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9945b3b565 VS: Restore support for PCH in CXX but not C within once target d9fd32b3b3 cmVisualStudio10TargetGenerator: Refactor per-source PCH logic Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5836
| * | | | | | VS: Restore support for PCH in CXX but not C within once targetBrad King2021-02-196-1/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix logic from commit 9df1f33c9a (VisualStudio: move PCH rules to projects when possible., 2020-10-15, v3.20.0-rc1~638^2) to explicitly disable PCH on sources that should not use the target-wide PCH rules. Fixes: #21827
| * | | | | | cmVisualStudio10TargetGenerator: Refactor per-source PCH logicBrad King2021-02-191-6/+6
| | |_|/ / / | |/| | | | | | | | | | | | | | | | De-duplicate the link language lookup.
* | | | | | Merge branch 'release-3.20'Brad King2021-02-220-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge topic 'cpackifw-scanbuild-fix' into release-3.20Brad King2021-02-221-2/+9
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 90c2f138ee CPackIFWInstaller: Avoid potential null pointer dereference Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5832
* | \ \ \ \ \ Merge topic 'cpackifw-scanbuild-fix'Brad King2021-02-221-2/+9
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 90c2f138ee CPackIFWInstaller: Avoid potential null pointer dereference Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5832
| * | | | | | CPackIFWInstaller: Avoid potential null pointer dereferenceCraig Scott2021-02-191-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In d16830324f (CPackIFW: Improve warning and docs for show page list option, 2021-02-14), code was added to report the current QtIFW version. That code didn't check that there was a Generator object before using it, resulting in a scanbuild warning about a potential null pointer dereference. Add a check and output a more general warning message if we don't have the current QtIFW version available to report.
* | | | | | | Merge branch 'release-3.20'Brad King2021-02-220-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge topic 'doc-cpack-dpkg-shlibdeps-l' into release-3.20Brad King2021-02-221-1/+1
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cf9a71870b Help: Fix CPACK_DEBIAN_PACKAGE_SHLIBDEPS_PRIVATE_DIRS documentation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5835
* | | | | | | Merge topic 'doc-cpack-dpkg-shlibdeps-l'Brad King2021-02-221-1/+1
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cf9a71870b Help: Fix CPACK_DEBIAN_PACKAGE_SHLIBDEPS_PRIVATE_DIRS documentation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5835
| * | | | | | Help: Fix CPACK_DEBIAN_PACKAGE_SHLIBDEPS_PRIVATE_DIRS documentationBrad King2021-02-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The docs added by commit d586a4ad60 (CPackDeb: dpkg-shlibdeps now supports searching for private shared libs, 2021-01-19, v3.20.0-rc1~115^2) specify the `-d` option, but the implementation actually uses the `-l` option. Issue: #21838
* | | | | | | CMake Nightly Date StampKitware Robot2021-02-221-1/+1
| |_|_|_|_|/ |/| | | | |
generated by cgit v0.12 at 2025-09-13 19:58:22 (GMT)