summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | | | | | Tests: Fix RunCMake.CMakePresets example PATH formatBrad King2021-05-051-0/+3
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 94c955e508 (Tests: Test the CMakePresets.json example in the documentation, 2020-10-09, v3.19.0-rc1~8^2) we transform the documented preset example for testing by replacing the generator. Extend the transformation with a step to fix `PATH` env var syntax.
* | | | | | CMake Nightly Date StampKitware Robot2021-05-061-1/+1
|/ / / / /
* | | | | Merge topic 'generate-cmake-build-command-parallel'Brad King2021-05-0513-13/+70
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d2b856bc92 ctest_build: Add the PARALLEL_LEVEL argument fc2ac46043 build_command: Add the PARALLEL_LEVEL argument 4dd4e9dd6c cmGlobalGenerator: Add parallel parameter to GenerateCMakeBuildCommand Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Brad King <brad.king@kitware.com> Merge-request: !6069
| * | | | | ctest_build: Add the PARALLEL_LEVEL argumentfriendlyanon2021-05-046-1/+25
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: #19712
| * | | | | build_command: Add the PARALLEL_LEVEL argumentfriendlyanon2021-05-045-7/+31
| | | | | | | | | | | | | | | | | | | | | | | | Issue: #19712
| * | | | | cmGlobalGenerator: Add parallel parameter to GenerateCMakeBuildCommandfriendlyanon2021-05-015-7/+16
| | | | | |
* | | | | | Merge topic 'doc-tls'Brad King2021-05-054-2/+20
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7398993f5b Help: Document CMAKE_TLS_VERIFY variable explicitly Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6064
| * | | | | | Help: Document CMAKE_TLS_VERIFY variable explicitlyMichael Hirsch2021-05-044-2/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously it was mentioned only in the `file` and `ExternalProject` documentation.
* | | | | | | Merge topic 'clang-ipo-support'Brad King2021-05-051-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3dd776ccfd Windows-Clang: Support duplicate object names in LTO archives Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6082
| * | | | | | | Windows-Clang: Support duplicate object names in LTO archivesBrad King2021-05-031-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the archive rules added by commit 6e3655db2c (Clang: add LTO support for GNU-command line clang on windows, 2019-07-08, v3.16.0-rc1~161^2~3) to match the `ar` convention we use for normal archives. Issue: #21988
* | | | | | | | Merge branch 'release-3.20'Brad King2021-05-050-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Merge topic 'binutils-var-private' into release-3.20Brad King2021-05-051-10/+12
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c33fb2e664 BinUtils: Use more-private temporary variable names Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6085
* | \ \ \ \ \ \ \ Merge topic 'binutils-var-private'Brad King2021-05-051-10/+12
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c33fb2e664 BinUtils: Use more-private temporary variable names Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6085
| * | | | | | | | BinUtils: Use more-private temporary variable namesBrad King2021-05-041-10/+12
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 4d786dfcfa (BinUtils: Avoid clobbering a variable named without a private prefix, 2021-04-06, v3.20.1~4^2) we use variables named `_tool` and `_name`, but these may still be common enough to affect project code. Use `_CMAKE_TOOL` and `_CMAKE_TOOL_NAME` instead, and unset them when finished. Fixes: #22140
* | | | | | | | CMake Nightly Date StampKitware Robot2021-05-051-1/+1
| | | | | | | |
* | | | | | | | Merge topic 'doc-review'Brad King2021-05-041-2/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b82052feb8 Help/dev/review: Clarify instructions to update existing merge requests Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6073
| * | | | | | | | Help/dev/review: Clarify instructions to update existing merge requestsSmit tay2021-05-031-2/+4
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge topic 'extend_toolchain_flag_to_cmake_preset'Brad King2021-05-0415-2/+129
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a9b968bb98 cmake-presets: Introduce `toolchainFile` preset option Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6045
| * | | | | | | | cmake-presets: Introduce `toolchainFile` preset optionRobert Maynard2021-04-2815-2/+129
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In v3 of the presets, the `--toolchain` command line argument now has a preset mapping.
* | | | | | | | | Merge topic 'mingw-archive-no-replace'Brad King2021-05-041-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e8f0b75ff9 Windows-GNU: Support duplicate object names when linking shared libraries Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6081
| * | | | | | | | | Windows-GNU: Support duplicate object names when linking shared librariesBrad King2021-05-031-1/+1
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend the change from commit 39d0ade07e (Windows-GNU: Support duplicate object names in large archives (#14874), 2014-04-14, v3.1.0-rc1~629^2~1) to apply to the temporary archive we create for linking shared libraries with MinGW tools. Issue: #21988
* | | | | | | | | Merge topic 'findswig-clean'Brad King2021-05-041-39/+55
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 229dd42158 Change find_path scope and add quotes ff6f7b232f FindSWIG: reduce calls to SWIG exe, and clean up variables Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6075
| * | | | | | | | | Change find_path scope and add quotesSeth R Johnson2021-05-031-8/+8
| | | | | | | | | |
| * | | | | | | | | FindSWIG: reduce calls to SWIG exe, and clean up variablesSeth R Johnson2021-05-021-38/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If all SWIG cache variables (EXECUTABLE, DIR, VERSION) are set, there should be no need to invoke the SWIG exe on a reconfigure. This changeset reduces the number of calls to the SWIG executable, and additonially prevents temporary `SWIG_xxx` values from propagating outside the `find_package` call. I also refactored the conditionals to be less nested (and thus more predictable), including changing theh definition of SWIG_USE_FILE to reflect that it's if and only if SWIG_FOUND is trure.
* | | | | | | | | | Merge topic 'vs-config-specific-csproj'Brad King2021-05-045-2/+51
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d8786bfa16 VS: Add support for per-config C# sources Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6055
| * | | | | | | | | | VS: Add support for per-config C# sourcesThomas Vaughan2021-05-035-2/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #22108
* | | | | | | | | | | Merge topic 'useswig-includes'Brad King2021-05-041-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d2296cdaab UseSWIG: remove duplicate target includes Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6074
| * | | | | | | | | | | UseSWIG: remove duplicate target includesSeth R Johnson2021-05-021-1/+1
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge topic 'vs-csharp-link'Brad King2021-05-044-2/+32
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 31bbcd1905 VS: Fix CSharp sources inside build directory Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6065
| * | | | | | | | | | | VS: Fix CSharp sources inside build directoryKinan Mahdi2021-05-034-2/+32
| | |_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #22104
generated by cgit v0.12 at 2025-02-13 07:54:32 (GMT)