summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'backport-3.18-ci-wix-download' into release-3.18Brad King2021-01-214-0/+23
|\ | | | | | | Merge-request: !5725
| * ci: download WiX on WindowsBrad King2021-01-212-0/+21
| | | | | | | | Avoid requiring Windows CI hosts to have WiX installed.
| * ci: speed up cmake and ninja downloads on WindowsBrad King2021-01-212-0/+2
|/ | | | | Invoke-WebRequest uses a progress bar by default, but we have no interactive session anyway. Turn it off to speed up downloads.
* Merge branch 'backport-ninja-no-cleandead' into release-3.18Brad King2020-12-142-15/+1
|\ | | | | | | Merge-request: !5614
| * Ninja: Remove cleandead on regenerationBrad King2020-12-142-15/+1
| | | | | | | | | | | | | | | | | | | | | | Remove the `cleandead` tool invocation added by commit fb18215904 (Ninja: clean ninja metadata once generated, 2019-05-13, v3.17.0-rc1~207^2). The tool deletes files that were not previously deleted by regenerating the build system. Also, there are use cases where no-longer-generated files should not be removed, such as Qt's TS files. Fixes: #21549
* | Merge branch 'FindPython-python2-soabi-suffix-fix' into release-3.18Brad King2020-12-071-2/+10
|\ \ | | | | | | | | | Merge-request: !5574
| * | FindPython2: avoid doubling the extension in CPython2 SOABIBen Boeckel2020-12-041-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 951640f1f9 (FindPython: manage SOABI for all Python versions, 2020-08-11) extended support for Python2's SOABI variable in order to support the PyPy interpreter as well. This caused a regression in the way that the SOABI variable was built up for the CPython interpreter. This caused the variable to be set to `.so` which ended up causing a doubling of the resulting `SOABI` variable in the end. Co-Author: Marc Chevrier <marc.chevrier@gmail.com> Fixes: #21548
* | | Merge branch 'cuda_detect_vs_codegen' into release-3.18Brad King2020-11-251-4/+8
|\ \ \ | |/ / |/| | | | | Merge-request: !5531
| * | CUDA: Fix user-set architectures during detection with Visual StudioRaul Tambre2020-11-251-4/+8
|/ / | | | | | | | | | | | | | | | | | | | | | | | | If the user specifies CMAKE_CUDA_ARCHITECTURES we use those during detection and error out if they don't work. For Visual Studio a dummy project file is used instead of invoking the compiler directly. NVCC would thus use its default and we'd fail if CMAKE_CUDA_ARCHITECTURES was anything other than NVCC's default. Use the necessary project file variable in CMakeDetermineCompilerId.cmake to match other generators. Fixes #21492.
* | CMake 3.18.5v3.18.5Brad King2020-11-181-1/+1
| |
* | Merge branch 'xcode-compiler-id-path' into release-3.18Brad King2020-11-124-4/+4
|\ \ | | | | | | | | | Merge-request: !5506
| * | Xcode: Extract CMAKE_<LANG>_COMPILER from compiler id with multiple archsBrad King2020-11-124-4/+4
|/ / | | | | | | | | | | | | | | | | When targeting a platform that supports multiple architectures, Xcode may choose to build all of them in our small compiler id project. Update the regex we use to extract the path to the compiler from the Xcode output to account for this. Fixes: #21425
* | Merge branch 'FindRuby-restore-VENDORLIB_DIR' into release-3.18Brad King2020-10-271-0/+1
|\ \ | | | | | | | | | Merge-request: !5434
| * | FindRuby: Restore compatibility variable RUBY_VENDORLIB_DIRBrad King2020-10-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit e672db628b (FindRuby: Rename variables to match case of module name, 2020-03-11, v3.18.0-rc1~546^2), the result variables named with the old `RUBY_` prefix are provided by compatibility code that maps from the new `Ruby_` prefix variables. This variable was accidentally left out. Fixes: #21369
* | | Merge branch 'cuda_vs_skip_computation' into release-3.18Brad King2020-10-275-2/+21
|\ \ \ | | | | | | | | | | | | Merge-request: !5422
| * | | VS: Don't compute CUDA options unless necessaryRaul Tambre2020-10-275-2/+21
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the following scenario (with 3.18 policies): 1. A CXX target is created. 2. CUDA language is enabled. CMake 3.18 introduced CMP0104, which requires CUDA_ARCHITECTURES to be set. Because the CXX target was created before CUDA was enabled it wouldn't have it set. The Visual Studio generator would however end up computing CUDA compile options for the CXX target, which would result in a fatal error due to the policy violation. There doesn't seem to be a reason to do this for targets that don't actually use the CUDA language, so we can skip and generate the CXX target just fine. Fixes: #21341
* | | Merge branch 'ninja-multi-per-config-sources' into release-3.18Brad King2020-10-263-1/+15
|\ \ \ | | | | | | | | | | | | Merge-request: !5430
| * | | Ninja Multi-Config: Don't try to calculate dependencies for "all"Kyle Edwards2020-10-263-1/+15
| |/ /
* | | Merge branch 'cmake-E-cat-binary' into release-3.18Brad King2020-10-1513-54/+109
|\ \ \ | |/ / |/| | | | | Merge-request: !5364
| * | cmake: Fix '-E cat' command for binary files on WindowsJohnny Jazeix2020-10-147-7/+31
| | | | | | | | | | | | | | | | | | | | | Reset `std::cout` to write in binary mode with no encoding conversions. Co-Author: Brad King <brad.king@kitware.com> Fixes: #21295
| * | cmConsoleBuf: Factor out cout/cerr console buffer managementBrad King2020-10-148-36/+66
| | |
| * | clang-format: Fix include block order in ctest.cxx and cpack.cxxBrad King2020-10-142-13/+14
|/ /
* | CMake 3.18.4v3.18.4Brad King2020-10-061-1/+1
| |
* | Merge topic 'csharp-source_group-bugfix' into release-3.18Brad King2020-10-064-6/+20
|\ \ | | | | | | | | | | | | | | | | | | 8d87cfdbf3 VS: Fix regression in C# source links Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5314
| * | VS: Fix regression in C# source linksKinan Mahdi2020-10-054-6/+20
| | | | | | | | | | | | | | | | | | Fix logic used since commit ac6b18cd90 (CSharp: Add support for source groups with out-of-source builds, 2020-02-18, v3.18.0-rc1~645^2). Add a check of the physical file location for C# source groups.
* | | Merge topic 'cxx-as-objcxx' into release-3.18Brad King2020-09-305-2/+14
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 8a2977ba55 OBJCXX: Fix regression for compiling cpp files as objcxx Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5296
| * | | OBJCXX: Fix regression for compiling cpp files as objcxxCristian Adam2020-09-295-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 8d61294c3e (PCH: Mark CMake PCH source files as -x <lang>-header, 2020-09-04, v3.18.3~14^2) we removed the explicit `-x objective-c++` flag. This broke cases with custom source extensions. Restore the explicit `-x objective-c[++]` flag and put it before the `<FLAGS>` placeholder. The latter will contain the proper `-x objective-c[++]-header` value and will override the `-x objective-c[++]` value set before. Fixes: #21234
* | | | Merge topic 'cuda-11.1-sm86' into release-3.18Brad King2020-09-301-3/+13
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | 5f6b0ba8b1 FindCUDA/select_compute_arch: Add CUDA 11.1 and SM86 support Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5292
| * | | FindCUDA/select_compute_arch: Add CUDA 11.1 and SM86 supportzasdfg bnm2020-09-291-3/+13
| |/ /
* | | Merge topic 'vs-c11' into release-3.18Brad King2020-09-291-0/+14
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | b11c723678 VS: Populate `std:c{11,17}` flag table entries for v142 Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Raul Tambre <raul@tambre.ee> Merge-request: !5290
| * | | VS: Populate `std:c{11,17}` flag table entries for v142Brad King2020-09-281-0/+14
| |/ / | | | | | | | | | | | | | | | | | | | | | The `-std:c11` option added by commit f7347f28c7 (MSVC: Record support for C11 and c_restrict, 2020-08-09, v3.18.2~9^2) needs this flag table entry to map in the VS IDE properly. Issue: #21069
* | | Merge topic 'FindJNI-aarch64' into release-3.18Brad King2020-09-281-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 696d16ae6c FindJNI: Add aarch64 support Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Vitaly Lipatov <lav@etersoft.ru> Merge-request: !5275
| * | | FindJNI: Add aarch64 supportBrad King2020-09-251-1/+1
| |/ / | | | | | | | | | | | | | | | | | | Extend the fix from commit 44dffbcc94 (FindJNI: Add arm64 support, 2020-08-25, v3.18.3~21^2) to cover the `aarch64` name too. Fixes: #21237
* | | Merge topic 'clang-llvm-lib' into release-3.18Brad King2020-09-251-1/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | f5d3da091b Clang: Look for llvm-lib when using MSVC-like front-end Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Thomas Bernard <thomas@famillebernardgouriou.fr> Merge-request: !5264
| * | | Clang: Look for llvm-lib when using MSVC-like front-endShoaib Meenai2020-09-241-1/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 55196a1440 (MSVC: Use 'lib' instead of 'link /lib' to create static libraries, 2020-01-10, v3.18.0-rc1~625^2) we changed CMake to use lib instead of `link /lib` to create static libraries, but it didn't search for `llvm-lib`. If you have `llvm-lib` but not `lib` (e.g. when cross-compiling), when `CMakeFindBinutils` is invoked for the `C` and `CXX` languages, `CMAKE_AR` is not found. When it's subsequently invoked for the ASM language, `CMAKE_ASM_SIMULATE_ID` and `CMAKE_ASM_COMPILER_FRONTEND_VARIANT` are not set (because `CMakeDetermineASMCompiler` doesn't call `CMAKE_DETERMINE_COMPILER_ID`, which sets those variables), so we go down the non-MSVC conditional and set `CMAKE_AR` to a GNU-style `ar`, which of course does not understand lib flags. Explicitly search for `llvm-lib` to avoid this situation.
* | | Merge topic 'FindPython-fix-regex' into release-3.18Brad King2020-09-241-1/+1
|\ \ \ | |/ / |/| | | | | | | | | | | | | | 6c094c1c1e FindPython: Fix erroneous regex in ABI check Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5257
| * | FindPython: Fix erroneous regex in ABI checkMarc Chevrier2020-09-231-1/+1
|/ / | | | | | | | | | | | | | | A regex added by commit 6fdfe2428d (FindPython: enhance ABI checks against include directory, 2020-09-02, v3.18.3~17^2) was missing a backslash. Fixes: #21223
* | CMake 3.18.3v3.18.3Brad King2020-09-221-1/+1
| |
* | Merge topic 'check-compiler-flag-result' into release-3.18Brad King2020-09-222-2/+0
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | d4390c13e9 Merge branch 'backport-3.17-check-compiler-flag-result' d46590910c Check*CompilerFlag: Do not set result as a normal variable too Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Alexander Grund <github@grundis.de> Merge-request: !5250
| * \ Merge branch 'backport-3.17-check-compiler-flag-result'Brad King2020-09-212-2/+0
| |\ \ |/ / /
| * | Check*CompilerFlag: Do not set result as a normal variable tooBrad King2020-09-212-2/+0
| |/ | | | | | | | | | | | | | | | | Refactoring in commit cb984c6627 (Check*CompilerFlag: Modernize modules, 2019-12-09, v3.17.0-rc1~320^2) accidentally left the result set as a normal variable in addition to as a cache entry. This is not specified by the documentation, and is not the behavior in CMake 3.16 and below. Fixes: #21207
* | Merge topic 'foreach-int-parse-range-check' into release-3.18Brad King2020-09-215-0/+15
|\ \ | | | | | | | | | | | | | | | | | | 0412b55b83 foreach: Fix crash parsing integer out of range Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5239
| * | foreach: Fix crash parsing integer out of rangeBen McMorran2020-09-185-0/+15
| | |
* | | Merge topic 'ninja-multi-automoc-regression' into release-3.18Brad King2020-09-186-7/+28
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 23fe4b861f Ninja Multi-Config: Fix dependencies of custom commands Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5238
| * | | Ninja Multi-Config: Fix dependencies of custom commandsKyle Edwards2020-09-176-7/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a9fd3a10 addressed the scenario where the depending target is a utility target, but not the scenario where the dependent target is a utility target. Account for this scenario. Also add a Qt-specific test case. Fixes: #21118
* | | | Merge topic 'FindMatlab-r2020b' into release-3.18Brad King2020-09-181-0/+1
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | 4d292aecb6 FindMatlab: add R2020b => 9.9 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5233
| * | | FindMatlab: add R2020b => 9.9Michael Hirsch2020-09-171-0/+1
| |/ /
* | | Merge topic 'ci-xcode-11.7' into release-3.18Brad King2020-09-171-3/+3
|\ \ \ | |/ / |/| | | | | | | | | | | | | | 53709c764e gitlab-ci: update macOS jobs to use Xcode 11.7 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5236
| * | gitlab-ci: update macOS jobs to use Xcode 11.7Brad King2020-09-171-3/+3
|/ /
* | Help: Update 3.18.2 release notes to mention 3.16.9 and 3.17.5Brad King2020-09-151-0/+1
| | | | | | | | | | A change made in 3.18.2 was backported to the 3.16 and 3.17 branches. Update the 3.18 release note to mention them.
generated by cgit v0.12 at 2025-02-13 19:42:29 (GMT)