summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'autogen-cmp0116-fix'Brad King2021-02-2425-148/+237
|\ | | | | | | | | | | | | | | | | | | | | 339dbc901f Help: Note that CMP0116 is recorded at the time of CC creation e3740e020e Tests: Test Qt autogen target with CMP0116 set to WARN cf34011ce7 Tests: Test per-CC behavior of CMP0116 3a95503512 Ninja: Use CMP0116 status recorded at time of custom command's creation f01f10e8fb cmCustomCommand: Record value of CMP0116 at time of creation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5848
| * Help: Note that CMP0116 is recorded at the time of CC creationKyle Edwards2021-02-231-1/+4
| |
| * Tests: Test Qt autogen target with CMP0116 set to WARNKyle Edwards2021-02-232-0/+3
| |
| * Tests: Test per-CC behavior of CMP0116Kyle Edwards2021-02-233-0/+38
| |
| * Ninja: Use CMP0116 status recorded at time of custom command's creationKyle Edwards2021-02-231-2/+2
| |
| * cmCustomCommand: Record value of CMP0116 at time of creationKyle Edwards2021-02-2318-145/+190
| |
* | Merge branch 'release-3.20'Brad King2021-02-240-0/+0
|\ \
| * \ Merge branch 'release-3.19' into release-3.20Brad King2021-02-240-0/+0
| |\ \
* | \ \ Merge branch 'release-3.19'Brad King2021-02-240-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'backport-3.19-preset-no-comments' into release-3.19Brad King2021-02-248-7/+25
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !5853
| * \ \ \ Merge branch 'ninja-status-stderr' into release-3.19Brad King2021-02-233-0/+12
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !5850
* | \ \ \ \ Merge branch 'release-3.20'Brad King2021-02-240-0/+0
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge topic 'preset-no-comments' into release-3.20Brad King2021-02-2410-20/+26
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 06e16ea008 Merge branch 'backport-3.19-preset-no-comments' into preset-no-comments afaa69f5b3 Tests: Remove comments from CMakePresetsTest/Good.json.in 4a92277f45 Revert "Help: Document JSON comment support in cmake-presets(7)" 431dd59b5e CMakePresets.json: Remove undocumented support for comments Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5853
* | \ \ \ \ \ Merge topic 'preset-no-comments'Brad King2021-02-2410-20/+26
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 06e16ea008 Merge branch 'backport-3.19-preset-no-comments' into preset-no-comments afaa69f5b3 Tests: Remove comments from CMakePresetsTest/Good.json.in 4a92277f45 Revert "Help: Document JSON comment support in cmake-presets(7)" 431dd59b5e CMakePresets.json: Remove undocumented support for comments Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5853
| * | | | | | Merge branch 'backport-3.19-preset-no-comments' into preset-no-commentsBrad King2021-02-248-7/+25
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | CMakePresets.json: Remove undocumented support for commentsKyle Edwards2021-02-248-7/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #21858
| * | | | | | Tests: Remove comments from CMakePresetsTest/Good.json.inKyle Edwards2021-02-241-9/+0
| | | | | | |
| * | | | | | Revert "Help: Document JSON comment support in cmake-presets(7)"Kyle Edwards2021-02-241-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert commit 8f1e607ed9 (Help: Document JSON comment support in cmake-presets(7), 2021-02-18). The support for comments was a mistake when the feature was implemented in 3.19, and is being removed.
* | | | | | | Merge branch 'release-3.20'Brad King2021-02-240-0/+0
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Merge topic 'ninja-status-stderr' into release-3.20Brad King2021-02-243-0/+12
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | / / | | | |_|/ / | | |/| | | | | | | | | | | | | | | d33c2c93d8 Tests: Update for upstream ninja change to write status on stderr Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5850
* | | | | | Merge topic 'ninja-status-stderr'Brad King2021-02-243-0/+12
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | d33c2c93d8 Tests: Update for upstream ninja change to write status on stderr Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5850
| * | | | | Tests: Update for upstream ninja change to write status on stderrBrad King2021-02-233-0/+12
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upstream ninja commit `ad3d29fb53` (Put builder output through status interface) from ninja PR 1899 changed the status output from stdout to stderr. In particular, `ninja: no work to do` is now printed on stderr. Update our RunCMake tests to accept this difference. A few RunCMake test cases check for `ninja: no work to do`. For those, move the message to stdout using `RunCMake_TEST_OUTPUT_MERGE`. The rest of the test cases do not care about the message, so remove it from the actual stderr content before comparing against that expected.
* | | | | CMake Nightly Date StampKitware Robot2021-02-241-1/+1
| | | | |
* | | | | Merge branch 'release-3.20'Brad King2021-02-230-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge topic 'ci-macos-arm64' into release-3.20Brad King2021-02-239-89/+146
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 397ced99d7 gitlab-ci: Add macos-arm64 jobs for Ninja and Xcode 0755c2ffbb gitlab-ci: rename macos build and test jobs to macos-x86_64 73150a3798 ci: add sccache 0.2.15 custom build for aarch64-apple-darwin cab41b96ac ci: update to sccache 0.2.15 on linux builds 8dcbe5688a ci: Use Qt macOS 10.13+ package for macOS build and test jobs Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !5851
* | \ \ \ \ Merge topic 'ci-macos-arm64'Brad King2021-02-239-89/+146
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 397ced99d7 gitlab-ci: Add macos-arm64 jobs for Ninja and Xcode 0755c2ffbb gitlab-ci: rename macos build and test jobs to macos-x86_64 73150a3798 ci: add sccache 0.2.15 custom build for aarch64-apple-darwin cab41b96ac ci: update to sccache 0.2.15 on linux builds 8dcbe5688a ci: Use Qt macOS 10.13+ package for macOS build and test jobs Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !5851
| * | | | | gitlab-ci: Add macos-arm64 jobs for Ninja and XcodeBrad King2021-02-234-0/+72
| | | | | | | | | | | | | | | | | | | | | | | | For now, leave these jobs out during merge requests.
| * | | | | gitlab-ci: rename macos build and test jobs to macos-x86_64Brad King2021-02-235-32/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes room for future equivalents for other architectures. The packaging jobs produce universal binaries, so leave them as-is.
| * | | | | ci: add sccache 0.2.15 custom build for aarch64-apple-darwinBrad King2021-02-231-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | Our custom build includes a patch to avoid server startup timeouts.
| * | | | | ci: update to sccache 0.2.15 on linux buildsBrad King2021-02-231-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The upstream release includes binaries for the architectures we need. However, the binaries do not have execute permission in their tarballs, so add it explicitly.
| * | | | | ci: Use Qt macOS 10.13+ package for macOS build and test jobsBrad King2021-02-231-52/+30
| |/ / / / | | | | | | | | | | | | | | | It is a universal binary for both `x86_64` and `arm64` architectures.
* | | | | 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
generated by cgit v0.12 at 2025-01-10 18:34:30 (GMT)