summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* | Merge branch 'release-3.17' into release-3.18Brad King2020-09-151-0/+9
|\ \ | |/
| * CMake 3.17.5v3.17.5Brad King2020-09-151-1/+1
| |
| * Merge branch 'backport-3.17-automoc-path-prefix-off' into release-3.17Brad King2020-09-151-0/+9
| |\
| | * Help: Add 3.17.5 release note about AUTOMOC_PATH_PREFIX default changeJoerg Bornemann2020-09-151-0/+9
| | |
| | * Merge branch 'backport-3.16-automoc-path-prefix-off'Brad King2020-09-151-5/+11
| | |\
| * | \ Merge branch 'release-3.16' into release-3.17Brad King2020-09-151-5/+11
| |\ \ \ | | |/ / | |/| |
| * | | Merge branch 'backport-3.17-automoc-depend-project-file' into release-3.17Brad King2020-08-319-1/+150
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !5166
* | \ \ \ Merge branch 'release-3.16' into release-3.18Brad King2020-09-151-5/+11
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | CMake 3.16.9v3.16.9Brad King2020-09-151-1/+1
| | | | |
| * | | | Merge branch 'backport-3.16-automoc-path-prefix-off' into release-3.16Brad King2020-09-151-5/+11
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Help: Add 3.16.9 release note about AUTOMOC_PATH_PREFIX default changeJoerg Bornemann2020-09-151-5/+11
| | | | |
| * | | | Merge branch 'backport-3.16-automoc-path-prefix-off' into release-3.16Brad King2020-08-104-5/+7
| |\ \ \ \ | | |/ / / | | | | | | | | | | Merge-request: !5105
| * | | | Merge branch 'backport-test-FindPkgConfig-isolate-env' into release-3.16Brad King2020-08-071-0/+5
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !5108
* | \ \ \ \ Merge topic 'armclang-fixes' into release-3.18Brad King2020-09-111-2/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3d1ed986e2 ARMClang: Fix link line generation after addition of armlink support Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Osama Moharam <osama.moharam.uw@renesas.com> Merge-request: !5211
| * | | | | | ARMClang: Fix link line generation after addition of armlink supportMarc Chevrier2020-09-101-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revise logic added by commit 73fb6ac82b (ARMClang: Add support for armlink, 2020-06-02, v3.18.0-rc1~27^2). Fixes: #21154
* | | | | | | Merge topic 'file-GENERATE-earlier' into release-3.18Brad King2020-09-111-0/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aee2c51224 file(GENERATE): Create output file structures for all directories first Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5209
| * | | | | | file(GENERATE): Create output file structures for all directories firstJosef Angstenberger2020-09-101-0/+2
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 36ded610af (PCH: Generate sources during Compute step, 2019-10-05, v3.16.0-rc1~2^2) the source file lookup is done earlier than before. Its parent commit f1fb63b306 (file(GENERATE): Create output file structures even earlier, 2019-10-07, v3.16.0-rc1~2^2~1) prepared for that. However, that commit did not account for generating and using files in separate subdirectories. Fix this by evaluating all generated files before adding automatic files. Fixes: #21144
* | | | | | Merge topic 'gitlab-ci-prefer-mr' into release-3.18Brad King2020-09-101-4/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f6a80ffd54 gitlab-ci: Prefer MR rules for any pipeline associated with a MR Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5214
generated by cgit v0.12 at 2025-01-14 08:07:56 (GMT)