summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'cpack-source-dir-symlink-test'Brad King2021-03-114-4/+25
|\ | | | | | | | | | | | | f42b048b9c Tests: Check symlinks to directories in RunCMake.CPackSymlinks Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5887
| * Tests: Check symlinks to directories in RunCMake.CPackSymlinksOlivier Iffrig2021-03-104-4/+25
| | | | | | | | Regression test for issue #21886
* | Merge topic 'file-COPY_FILE-subcommand'Brad King2021-03-1135-0/+334
|\ \ | | | | | | | | | | | | | | | | | | | | | 088444211e file: add `COPY_FILE` subcommand 100016e9cb cmSystemTools: add utilities to copy a file with error handling Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5885
| * | file: add `COPY_FILE` subcommandBen Boeckel2021-03-1033-0/+270
| | | | | | | | | | | | | | | | | | The `file(COPY)` subcommand is overloaded and busy for such a simple operation. Instead, make a simpler subcommand with error handling support.
| * | cmSystemTools: add utilities to copy a file with error handlingBen Boeckel2021-03-092-0/+64
| | |
* | | Merge branch 'release-3.20'Brad King2021-03-110-0/+0
|\ \ \
| * \ \ Merge topic 'xcode-framework-quoting' into release-3.20Brad King2021-03-114-1/+26
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4f9a71974e Xcode: Restore support for spaces in framework names Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5899
* | \ \ \ Merge topic 'xcode-framework-quoting'Brad King2021-03-115-1/+27
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 00ecddd9eb Tests: Enable Framework test case with spaces everywhere possible b6cc9be009 Merge branch 'backport-xcode-framework-quoting' into xcode-framework-quoting 4f9a71974e Xcode: Restore support for spaces in framework names Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5899
| * | | | | Tests: Enable Framework test case with spaces everywhere possibleBrad King2021-03-102-1/+2
| | | | | |
| * | | | | Merge branch 'backport-xcode-framework-quoting' into xcode-framework-quotingBrad King2021-03-104-1/+26
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Xcode: Restore support for spaces in framework namesBrad King2021-03-104-1/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit ce2dee9e5b (Xcode: Don't add framework as -framework argument in linker info list, 2020-09-28, v3.19.0-rc1~47^2) we split up the path to a framework into the directory and framework name parts, but only retained the quoting on the directory part. Restore quoting of the framework name. Fixes: #21910
* | | | | | Merge branch 'release-3.20'Brad King2021-03-110-0/+0
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge topic 'cray-compiler-wrapper-detection' into release-3.20Brad King2021-03-113-5/+5
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 13144e82cd Cray: Enable Cray compiler wrapper detection on all platforms Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5897
* | \ \ \ \ \ Merge topic 'cray-compiler-wrapper-detection'Brad King2021-03-113-5/+5
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 13144e82cd Cray: Enable Cray compiler wrapper detection on all platforms Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5897
| * | | | | | Cray: Enable Cray compiler wrapper detection on all platformsJustin LaPolla2021-03-103-5/+5
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously were checking for the `__CRAYXC` and `__CRAYXE` predefined macros. These macros reflect the platform that the compiler wrapper is running on, i.e. Cray XC and Cray XE machines. They are not defined on other platforms such as Apollo80. Switch to the `__CRAYXT_COMPUTE_LINUX_TARGET` macro. The Cray cc/CC/ftn wrappers always define this macro on the command line. This macro has been in use for many years, and is believed to be a reliable way to detect current and older Cray compiler wrappers. Fixes: #21904
* | | | | | CMake Nightly Date StampKitware Robot2021-03-111-1/+1
| | | | | |
* | | | | | Merge branch 'release-3.20'Brad King2021-03-100-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge topic 'ep-fc-revert-refactoring' into release-3.20Brad King2021-03-1035-1911/+1112
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 57d442e182 Revert ExternalProject and FetchContent refactoring Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5898
* | \ \ \ \ \ Merge topic 'ep-fc-revert-refactoring'Brad King2021-03-1035-1911/+1112
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 57d442e182 Revert ExternalProject and FetchContent refactoring Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5898
| * | | | | | Revert ExternalProject and FetchContent refactoringCraig Scott2021-03-0935-1911/+1112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring of the ExternalProject and FetchContent modules moved the commands into CMake scripts. This broke custom commands that used shell redirection or special build tool variables of the form $(MakeVar). Undo the sequence of commits that performed this refactoring and follow-up fixes associated with it. The following commits are reverted by this change: 4f3d1abbb4 (ExternalProject: Refactor pre-configure steps to support no-target uses, 2021-02-05) 17e5516e60 (FetchContent: Invoke steps directly and avoid a separate sub-build, 2021-01-29) bd876f3849 (FetchContent: Restore patch command support, 2021-02-18) 404cddb7bb (ExternalProject: Fix misuse of IS_NEWER_THAN in timestamp checks, 2021-02-21) b0da671243 (FetchContent: Don't update timestamps if files don't change, 2021-02-18) Fixes: #21892
* | | | | | | Merge branch 'release-3.20'Brad King2021-03-100-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge topic 'FindMatlab-MCR-vars' into release-3.20Brad King2021-03-101-2/+9
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5ba1f4b6ee FindMatlab: Fix Matlab_LIBRARIES for MCR Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5896
* | | | | | | Merge topic 'FindMatlab-MCR-vars'Brad King2021-03-101-2/+9
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5ba1f4b6ee FindMatlab: Fix Matlab_LIBRARIES for MCR Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5896
| * | | | | | FindMatlab: Fix Matlab_LIBRARIES for MCRSilvio Traversaro2021-03-091-2/+9
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit bda5e2ac8f (FindMatlab: Only include engine and dataarray libraries if they are found, 2020-12-11, v3.20.0-rc1~297^2~1) we fixed the imported target to contain optional libraries only if they are found. Do the same for `Matlab_LIBRARIES`.
* | | | | | Merge topic 'ninja-utf8'Brad King2021-03-103-9/+66
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9af6e2e7b2 Ninja: Use new wincodepage tool to determine encoding Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5860
| * | | | | | Ninja: Use new wincodepage tool to determine encodingKyle Edwards2021-03-093-9/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ninja 1.11 and later uses UTF-8 on Windows when possible, and includes a tool that reports the code page in use. Use this tool to determine what encoding to write the Ninja files in. Fixes: #21866
* | | | | | | Merge topic 'test-ifort-windows'Brad King2021-03-101-0/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7b0ab0439d Tests: Fix FortranModules test with Intel compiler on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5894
| * | | | | | | Tests: Fix FortranModules test with Intel compiler on WindowsBrad King2021-03-091-0/+5
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | The test regularly fails updating the `vc*.pdb` compiler-generated PDB file. Add the `/Z7` flag as the compiler suggests for this.
* | | | | | | Merge topic 'test-RunCMake-fail-info'Brad King2021-03-103-51/+47
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e8065554a8 Tests: Teach RunCMake to always print the command on failure 5f03744e36 Tests: Move RunCMake option construction closer to use f4d154755a Tests: Reverse RunCMake code path order 6fd7e8c53f Tests: Make RunCMake.Generator{Platform,Toolset} two-flag cases explicit Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5892
| * | | | | | Tests: Teach RunCMake to always print the command on failureBrad King2021-03-091-40/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously we only printed explicit `RunCMake_TEST_COMMAND` cases on failure. Refactor the RunCMake infrastructure so that we always define `RunCMake_TEST_COMMAND` internally, and print it on failure.
| * | | | | | Tests: Move RunCMake option construction closer to useBrad King2021-03-091-9/+9
| | | | | | |
| * | | | | | Tests: Reverse RunCMake code path orderBrad King2021-03-091-15/+15
| | | | | | |
| * | | | | | Tests: Make RunCMake.Generator{Platform,Toolset} two-flag cases explicitBrad King2021-03-092-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not rely on the RunCMake infrastructure to pass `-T` or `-A`.
* | | | | | | CMake Nightly Date StampKitware Robot2021-03-101-1/+1
| |/ / / / / |/| | | | |
* | | | | | Merge topic 'update-kwsys'Brad King2021-03-094-15/+50
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4d86c907f3 Merge branch 'upstream-KWSys' into update-kwsys 9e556829c8 KWSys 2021-03-08 (5bfba5e1) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5890
| * \ \ \ \ \ Merge branch 'upstream-KWSys' into update-kwsysBrad King2021-03-084-15/+50
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By KWSys Upstream * upstream-KWSys: KWSys 2021-03-08 (5bfba5e1)
| | * | | | | | KWSys 2021-03-08 (5bfba5e1)KWSys Upstream2021-03-084-15/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit 5bfba5e1a988e16df833e86062d61f4b70d83645 (master). Upstream Shortlog ----------------- Ben Boeckel (4): f69c5cb7 Directory: return a bool literal on Windows 2a118b34 SystemTools: use nullptr in Windows-only code 7ee0dbee Directory: capture the error message dd703ac6 SystemTools: make file copying mechanisms public Sean McBride (1): 3ba8a6de Glob: Change deleted ctor and operator= from private to public
* | | | | | | | Merge topic 'soname-spaces'Brad King2021-03-096-4/+35
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7621861f30 Tests: Update LibName to cover spaces in shared library name 388eb83c09 Tests: Enable MAKE_SUPPORTS_SPACES tests with Ninja generators c0a3317497 Ninja: Escape SONAME on linker command line 9dfa7981d5 Makefiles: Escape SONAME on linker command line Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5880
| * | | | | | | | Tests: Update LibName to cover spaces in shared library nameBrad King2021-03-084-0/+26
| | | | | | | | |
| * | | | | | | | Tests: Enable MAKE_SUPPORTS_SPACES tests with Ninja generatorsBrad King2021-03-081-1/+1
| | | | | | | | |
| * | | | | | | | Ninja: Escape SONAME on linker command lineAlexander Stein2021-03-041-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the shared object name contains spaces, they need to be properly escaped, or link command will fail. This was already done for soname symlink creation in commit 13c92b4a30 (Ninja: Fix creation of library symlinks in folders with spaces, 2019-05-20, v3.15.0-rc1~87^2). Fixes: #20331
| * | | | | | | | Makefiles: Escape SONAME on linker command lineAlexander Stein2021-03-041-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the shared object name contains spaces, they need to be properly escaped, or link command will fail.
* | | | | | | | | Merge branch 'release-3.20'Brad King2021-03-090-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| * | | | | | | | Merge branch 'release-3.19' into release-3.20Brad King2021-03-090-0/+0
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | |
| | * | | | | | | Merge branch 'CrayPrgEnv-detection' into release-3.19Brad King2021-03-083-5/+5
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !5889
* | | \ \ \ \ \ \ \ Merge branch 'release-3.20'Brad King2021-03-090-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge topic 'CrayPrgEnv-detection' into release-3.20Brad King2021-03-093-5/+5
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 23b101de60 Revert "Cray: Fix Cray compiler detection on new platforms" Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5889
* | | | | | | | | | Merge topic 'CrayPrgEnv-detection'Brad King2021-03-093-5/+5
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | / / / | |_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | 23b101de60 Revert "Cray: Fix Cray compiler detection on new platforms" Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5889
| * | | | | | | | Revert "Cray: Fix Cray compiler detection on new platforms"Brad King2021-03-083-5/+5
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The justification in commit 9ee4a42813 (Cray: Fix Cray compiler detection on new platforms, 2020-12-01, v3.19.2~26^2) confuses detection of the CrayPrgEnv with identification of the Cray compiler. The change regressed detection of the CrayPrgEnv on non-Cray compilers. Revert it pending further investigation into the original problem. Fixes: #21894
* | | | | | | | CMake Nightly Date StampKitware Robot2021-03-091-1/+1
| |_|_|/ / / / |/| | | | | |
generated by cgit v0.12 at 2025-01-10 04:10:07 (GMT)