summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'update-kwsys'Brad King2021-05-104-31/+132
|\ | | | | | | | | | | | | | | ba87a84339 Merge branch 'upstream-KWSys' into update-kwsys 07727928f9 KWSys 2021-05-07 (979d7db0) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6101
| * Merge branch 'upstream-KWSys' into update-kwsysBrad King2021-05-074-31/+132
| |\ | | | | | | | | | | | | | | | # By KWSys Upstream * upstream-KWSys: KWSys 2021-05-07 (979d7db0)
| | * KWSys 2021-05-07 (979d7db0)KWSys Upstream2021-05-074-31/+132
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit 979d7db0d534b25cc41f5defdc121dce0f9da10b (master). Upstream Shortlog ----------------- Ali Mohammad Pur (1): 1ea48581 ProcessUNIX: Fix kwsysProcessesSignalHandler() if !KWSYSPE_USE_SIGINFO Brad King (1): 8f3c4879 Status: Fix GetWindows return type Georg Schwab (2): fd2ec23d SystemTools: Implement FileIsSymlink using canonical reparse structure 3683e5ab SystemTools: Implement CreateSymlink and ReadSymlink on Windows
* | | Merge topic 'install-symlink-to-directory'Brad King2021-05-106-1/+24
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | d71a7cc19d install(FILES): Allow installation of symlinks to directory Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6098
| * | | install(FILES): Allow installation of symlinks to directoryJens Carl2021-05-066-1/+24
| | | | | | | | | | | | | | | | | | | | | | | | Allow symbolic links to a directory to be installed via install(FILES ...). Fixes: #22159
* | | | Merge topic 'windows-symlink-errors'Brad King2021-05-107-10/+26
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d7522b8f86 cmSystemTools: Improve CreateLink and CreateSymlink error codes Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6096
| * | | | cmSystemTools: Improve CreateLink and CreateSymlink error codesBrad King2021-05-077-10/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 7f89053953 (cmSystemTools: Return KWSys Status from CreateLink and CreateSymlink, 2021-04-15) we just took the `-err` from libuv and treated it as a POSIX error. This is accurate on POSIX, but on Windows does not match the POSIX error codes. Use `uv_fs_get_system_error` to get the actual system error code. This requires libuv 1.38 or higher. Require that for Windows, but fall back to the previous approach on POSIX.
* | | | | Merge branch 'release-3.20'Brad King2021-05-100-0/+0
|\ \ \ \ \
| * \ \ \ \ Merge topic 'FindBoost-1.76' into release-3.20Brad King2021-05-101-2/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 79be37b94e FindBoost: Add support for Boost 1.76 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6100
* | \ \ \ \ \ Merge topic 'FindBoost-1.76'Brad King2021-05-101-2/+2
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 79be37b94e FindBoost: Add support for Boost 1.76 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6100
| * | | | | | FindBoost: Add support for Boost 1.76Brad King2021-05-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the list of known versions. Run the command cmake -DBOOST_DIR=/path/to/boost_1_76_0 \ -P Utilities/Scripts/BoostScanDeps.cmake to extract dependencies from the 1.76.0 source tree. They are the same as 1.75's dependencies, so just update the version check for warning about newer versions. Fixes: #22167
* | | | | | | Merge branch 'release-3.20'Brad King2021-05-100-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge topic 'ep-update-git-hash-missing' into release-3.20Brad King2021-05-104-4/+21
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5e941a545b ExternalProject: Ensure git fetch if updating to hash we don't have yet Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !6109
* | \ \ \ \ \ \ Merge topic 'ep-update-git-hash-missing'Brad King2021-05-104-4/+21
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5e941a545b ExternalProject: Ensure git fetch if updating to hash we don't have yet Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !6109
| * | | | | | | ExternalProject: Ensure git fetch if updating to hash we don't have yetCraig Scott2021-05-094-4/+21
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In ac6a4d4884 (ExternalProject: Improve robustness of update step, 2020-10-17), the method used to check whether we already have a commit or not was changed from using git rev-list to git rev-parse. The new logic assumed rev-parse would output nothing if given a commit hash it didn't know about, but it simply prints the hash again without raising an error in this scenario. Amend that logic by adding ^{commit} to the ref to ensure we do get an error if that ref is not currently known. Fixes: #22166
* | | | | | | CMake Nightly Date StampKitware Robot2021-05-101-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2021-05-091-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2021-05-081-1/+1
| | | | | | |
* | | | | | | Merge topic 'ci-cmake.org-help'Brad King2021-05-075-6/+93
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a5a4b0b6ab gitlab-ci: add jobs to upload cmake.org/cmake/help/git-{master,stage} docs 354ae6fe2e gitlab-ci: add jobs to build cmake.org/cmake/help/git-{master,stage} docs eb7cbb577e gitlab-ci: clarify name of rsync upload block for binaries Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !6103
| * | | | | | gitlab-ci: add jobs to upload cmake.org/cmake/help/git-{master,stage} docsBrad King2021-05-072-0/+39
| | | | | | |
| * | | | | | gitlab-ci: add jobs to build cmake.org/cmake/help/git-{master,stage} docsBrad King2021-05-074-0/+48
| | | | | | |
| * | | | | | gitlab-ci: clarify name of rsync upload block for binariesBrad King2021-05-072-6/+6
|/ / / / / /
* | | | | | Merge topic 'ctest-clicolor'Brad King2021-05-071-0/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | df0e50d756 CTest: Add env var CLICOLOR to disable color output Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6076
| * | | | | | CTest: Add env var CLICOLOR to disable color outputMartin Willers2021-05-061-0/+4
| | |_|/ / / | |/| | | | | | | | | | | | | | | | Based on the implementation in Terminal.c:kwsysTerminalStreamIsVT100.
* | | | | | Merge topic 'FindProtobuf-grpc-plugin'Brad King2021-05-075-2/+34
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f2a4b879b1 FindProtobuf: Add PLUGIN parameter to protobuf_generate Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6068
| * | | | | | FindProtobuf: Add PLUGIN parameter to protobuf_generateFrank Lange2021-05-065-2/+34
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | This allows for example reusing the function for generating gRPC code by specifying which grpc plugin to use.
* | | | | | Merge topic 'Fujitsu-Fortran-Ninja'Brad King2021-05-071-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 284d12a426 Fujitsu: Make explicit Fortran preprocessing under Ninja more robust Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6080
| * | | | | | Fujitsu: Make explicit Fortran preprocessing under Ninja more robustEisuke Kawashima2021-05-061-1/+1
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tell the Fortran compiler to write preprocessor output directly to a file, as we do for the GNU compiler. The previous "redirect stdout" approach could break checks using flags that add information to stdout when called with `-###`. Fixes: #22156
* | | | | | Merge branch 'release-3.20'Brad King2021-05-070-0/+0
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge topic 'improve_cuda_toolkit_extraction_regex' into release-3.20Brad King2021-05-073-3/+3
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5e931c5a97 CUDA: improve regex for CUDA Toolkit root from nvcc verbose output Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Raul Tambre <raul@tambre.ee> Merge-request: !6094
* | \ \ \ \ \ Merge topic 'improve_cuda_toolkit_extraction_regex'Brad King2021-05-073-3/+3
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5e931c5a97 CUDA: improve regex for CUDA Toolkit root from nvcc verbose output Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Raul Tambre <raul@tambre.ee> Merge-request: !6094
| * | | | | | CUDA: improve regex for CUDA Toolkit root from nvcc verbose outputRobert Maynard2021-05-063-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The original regular expression was greedy and would match any environment variable ending with `TOP` (like `DESKTOP`). This is an issue on windows where `nvcc -v` would output all environment variables before the compiler's verbose output. To resolve this issue we use a tighter match algorithm that looks for `#$ TOP=` instead of `TOP=`. Fixes: #22158
* | | | | | | CMake Nightly Date StampKitware Robot2021-05-071-1/+1
| |_|_|/ / / |/| | | | |
* | | | | | Merge topic 'update-kwsys'Brad King2021-05-061-1/+2
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4141866dfe Merge branch 'upstream-KWSys' into update-kwsys 760bdfb26e KWSys 2021-05-06 (2fa93cfc) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6095
| * | | | | Merge branch 'upstream-KWSys' into update-kwsysBrad King2021-05-061-1/+2
| |\ \ \ \ \ |/ / / / / / | | | | | _ | | | | | | | | | | | | | | | # By KWSys Upstream * upstream-KWSys: KWSys 2021-05-06 (2fa93cfc)
| * | | | KWSys 2021-05-06 (2fa93cfc)KWSys Upstream2021-05-061-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit 2fa93cfca6291e8eaffa2a34d2d7908c93e64a6c (master). Upstream Shortlog ----------------- Brad King (1): 5c6539ca Terminal: Revert "Simplify CLICOLOR_FORCE check"
* | | | | Merge topic 'nmake-utf8'Brad King2021-05-067-2/+61
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f3f57cc4ed NMake: Use UTF-8 with BOM if supported by nmake 186c9bff53 NMake: Check nmake version for support of UTF-8 8a4f536be6 NMake: Detect nmake version Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6041
| * | | | | NMake: Use UTF-8 with BOM if supported by nmakeAmine Najahi2021-05-056-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: #21792
| * | | | | NMake: Check nmake version for support of UTF-8Brad King2021-05-052-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | NMake version 9 and above support UTF-8 encoded makefiles with a BOM.
| * | | | | NMake: Detect nmake versionBrad King2021-05-052-0/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Run `nmake -?` and extract the version from its output. Use a timeout because Watcom tools come with a `nmake` tool that always waits for user input on `-?`.
* | | | | | Merge topic 'ci-continuous-help'Brad King2021-05-061-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 71665c8cb9 gitlab-ci: Clarify conditions enabling jobs for continuous build of stage Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6091
| * | | | | | gitlab-ci: Clarify conditions enabling jobs for continuous build of stageBrad King2021-05-051-2/+2
| | | | | | |
* | | | | | | Merge topic 'update-kwsys'Brad King2021-05-062-2/+19
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4b73f113ba Merge branch 'upstream-KWSys' into update-kwsys 04c6e736f6 KWSys 2021-05-05 (e9ca4104) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6088
| * \ \ \ \ \ \ Merge branch 'upstream-KWSys' into update-kwsysBrad King2021-05-052-2/+19
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | / / / / | | | |/ / / / | | |/| | | | | | | | | | | # By KWSys Upstream * upstream-KWSys: KWSys 2021-05-05 (e9ca4104)
| | * | | | | KWSys 2021-05-05 (e9ca4104)KWSys Upstream2021-05-052-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit e9ca4104e816c28e3fcf94ce69fd75ca9498f4a7 (master). Upstream Shortlog ----------------- Ben Boeckel (1): 99ffa991 cmake: clear some configure checks when the deployment target changes Martin Willers (2): bbf6cdef Terminal: Simplify CLICOLOR_FORCE check f308fcfb Terminal: Disable color output when CLICOLOR is set to 0
* | | | | | | Merge branch 'release-3.20'Brad King2021-05-060-0/+0
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Merge topic 'objc-osx-architectures' into release-3.20Brad King2021-05-061-1/+1
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5972094708 ObjectiveC: Respect OSX_ARCHITECTURES for OBJC Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6090
* | | | | | | Merge topic 'objc-osx-architectures'Brad King2021-05-061-1/+1
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5972094708 ObjectiveC: Respect OSX_ARCHITECTURES for OBJC Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6090
| * | | | | | ObjectiveC: Respect OSX_ARCHITECTURES for OBJCBrad King2021-05-051-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a typo from commit 940fc62962 (macOS: Respect OSX_ARCHITECTURES for ASM, 2020-08-21, v3.19.0-rc1~270^2). Fixes: #22152
* | | | | | Merge topic 'preset-test-example'Brad King2021-05-061-0/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fa16b462f1 Tests: Fix RunCMake.CMakePresets example PATH format Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Kyle Edwards <kyle.edwards@kitware.com> Merge-request: !6087