summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* cmSystemTools: add utilities to copy a file with error handlingBen Boeckel2021-03-092-0/+64
|
* 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
| |_|_|/ / |/| | | |
* | | | | Merge topic 'ExternalData-windows'Brad King2021-03-082-10/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 31be23dd1d ci: Restore the Module.ExternalData test on Windows fdfbf89f0c ExternalData: Avoid replacing a concurrently-created object Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !5883
| * | | | | ci: Restore the Module.ExternalData test on WindowsBrad King2021-03-051-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit a58e3c7e8b (ci: Skip the Module.ExternalData test on Windows, 2020-10-01, v3.19.0-rc1~59^2) the test was dropped pending further investigation. We've now (hopefully) resolved the underlying problem, so we can restore the test.
| * | | | | ExternalData: Avoid replacing a concurrently-created objectBrad King2021-03-051-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If more than one content link references the same object, the build system may launch multiple download processes for the same object concurrently. Use whichever one finishes first, and discard the others. Without this, we replace the objects and use the last finisher instead of the first. This is okay on non-Windows platforms where `rename(2)` gives reliable atomic replacement. However, on Windows platforms and NTFS this is less reliable. I've observed `MoveFileEx` somehow cause another process to get `ERROR_SHARING_VIOLATION` when attempting to read the destination file. We may be able to improve the `file(RENAME)` implementation on modern Windows 10 versions, but for ExternalData's use case it is simpler to just not replace existing objects.
* | | | | | Merge topic 'vs-flag-table-refactor'Brad King2021-03-085-262/+208
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1b33150f7e cmGlobalVisualStudio10Generator: Generalize flag table lookup interface 414b5e0119 cmGlobalVisualStudio10Generator: Clarify LoadFlagTable argument name cbba9f26a8 cmGlobalVisualStudio10Generator: Drop unnecessary temporaries d5522f096d cmGlobalVisualStudio10Generator: Drop default toolset name canonicalization 99f6f1b3b9 cmGlobalVisualStudio10Generator: Remove redundant arguments 1b774e18fb cmGlobalVisualStudio10Generator: Remove redundant arguments a1c0758ea0 cmGlobalVisualStudio10Generator: Clarify method name e562e8987c cmGlobalVisualStudio10Generator: Remove unused flag table method argument ... Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5884
| * | | | | | cmGlobalVisualStudio10Generator: Generalize flag table lookup interfaceBrad King2021-03-052-22/+43
| | | | | | |
| * | | | | | cmGlobalVisualStudio10Generator: Clarify LoadFlagTable argument nameBrad King2021-03-052-6/+6
| | | | | | |
| * | | | | | cmGlobalVisualStudio10Generator: Drop unnecessary temporariesBrad King2021-03-051-16/+16
| | | | | | |
| * | | | | | cmGlobalVisualStudio10Generator: Drop default toolset name canonicalizationBrad King2021-03-051-27/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The default toolset names are always canonical.
| * | | | | | cmGlobalVisualStudio10Generator: Remove redundant argumentsBrad King2021-03-052-30/+13
| | | | | | |
| * | | | | | cmGlobalVisualStudio10Generator: Remove redundant argumentsBrad King2021-03-052-30/+24
| | | | | | |
| * | | | | | cmGlobalVisualStudio10Generator: Clarify method nameBrad King2021-03-052-26/+28
| | | | | | |
| * | | | | | cmGlobalVisualStudio10Generator: Remove unused flag table method argumentBrad King2021-03-052-76/+66
| | | | | | |
| * | | | | | cmGlobalVisualStudio10Generator: Adopt flag table name methodsBrad King2021-03-055-204/+177
| |/ / / / / | | | | | | | | | | | | | | | | | | Migrate them from `cmVisualStudio10ToolsetOptions`.
* | | | | | Merge topic 'clarify_find_searches_in_respect_to_env_variables'Brad King2021-03-081-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 934861e354 Find: Document that first argument to PATHS and HINTS can be ENV{} Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5886
| * | | | | | Find: Document that first argument to PATHS and HINTS can be ENV{}Robert Maynard2021-03-051-2/+2
| |/ / / / /
* | | | | | Merge branch 'release-3.20'Brad King2021-03-080-0/+0
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge topic 'cray-fortran' into release-3.20Brad King2021-03-081-0/+4
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ef513fe3d1 Cray: Enable explicit Fortran preprocessing for Ninja generator Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5882
* | \ \ \ \ \ Merge topic 'cray-fortran'Brad King2021-03-081-0/+4
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ef513fe3d1 Cray: Enable explicit Fortran preprocessing for Ninja generator Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5882
| * | | | | | Cray: Enable explicit Fortran preprocessing for Ninja generatorBrad King2021-03-051-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cray 11.0 adds support for preprocessing with output written to a specified file (instead of always next to the source). Use it to enable Cray Fortran with the Ninja generator. Patch-by: James Elliott Fixes: #20731
* | | | | | | CMake Nightly Date StampKitware Robot2021-03-081-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2021-03-071-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2021-03-061-1/+1
| |_|/ / / / |/| | | | |
* | | | | | Merge topic 'file-RENAME'Brad King2021-03-0525-18/+254
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9bf40d8027 file(RENAME): Add option to not replace existing path 3600c6cd8c cmSystemTools: Add RenameFile option to not replace destination c61292726c file(RENAME): Add option to capture error message on failure 0c2dc34504 cmSystemTools: Add RenameFile signature to capture the error message adc351db8f Tests: Add RunCMake helper to run a plain script Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5877
| * | | | | | file(RENAME): Add option to not replace existing pathBrad King2021-03-0410-5/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a `NO_REPLACE` option that prevents overwriting `<newname>` if it exists.
| * | | | | | cmSystemTools: Add RenameFile option to not replace destinationBrad King2021-03-043-10/+41
| | | | | | |
| * | | | | | file(RENAME): Add option to capture error message on failureBrad King2021-03-0416-9/+105
| | | | | | |
| * | | | | | cmSystemTools: Add RenameFile signature to capture the error messageBrad King2021-03-042-3/+48
| | | | | | |
| * | | | | | Tests: Add RunCMake helper to run a plain scriptBrad King2021-03-031-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Many tests covering CMake scripting commands can work without initializing a full generator.
* | | | | | | Merge branch 'release-3.20'Brad King2021-03-050-0/+0
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Merge topic 'cmake-gui-search-case' into release-3.20Brad King2021-03-052-4/+4
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9ec50ff157 cmake-gui: Restore search bar case insensitivity Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5878
* | | | | | | Merge topic 'cmake-gui-search-case'Brad King2021-03-052-4/+4
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9ec50ff157 cmake-gui: Restore search bar case insensitivity Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5878
| * | | | | | cmake-gui: Restore search bar case insensitivityBrad King2021-03-042-4/+4
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since these changes: * commit f1de6f6682 (cmake-gui: Support building against Qt6, 2020-12-17, v3.20.0-rc1~205^2~7) * commit 134d69121e (cmake-gui: Restore search bar for cache view and environment dialog, 2021-02-22, v3.20.0-rc2~12^2) the search bar is no longer case insensitive when using Qt 5.12.[0-1], and possibly some later versions. It works as of Qt 5.15 though, so update our version check accordingly. Fixes: #21884
* | | | | | Merge topic 'cpack-source-dir-symlink'Brad King2021-03-051-1/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c456b09513 CPack: Fix symbolic link detection for directories Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5879