summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* cmGlobalGenerator: FindMakeProgram() at a generator-specific timeKyle Edwards2020-11-234-1/+29
| | | | | | | | | | d5b5c192 moved FindMakeProgram() to an earlier time, which resulted in CMAKE_MAKE_PROGRAM not being read from the toolchain file. Change it to only call FindMakeProgram() early in the specific cases of Visual Studio and Xcode, and restore the old behavior for all other generators. Fixes: #21486
* Merge topic 'ctest_custom_versions' into release-3.19Brad King2020-11-2317-34/+0
|\ | | | | | | | | | | | | 6e7625989c Help: Fix `.. versionadded` directives for CTEST_CUSTOM_* variables Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5524
| * Help: Fix `.. versionadded` directives for CTEST_CUSTOM_* variablesNikita Nemkin2020-11-2117-34/+0
| | | | | | | | | | | | CTEST_CUSTOM_* variables predate 3.0, but the docs were only added in 3.4. Issue: #19715
* | Merge topic 'cuda_11' into release-3.19Brad King2020-11-232-4/+8
|\ \ | | | | | | | | | | | | | | | | | | | | | 046e454fdd CUDA: Error if can't determine toolkit library root 440dc98b07 CUDA: Clang CUDA 11.1 support Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5525
| * | CUDA: Error if can't determine toolkit library rootRaul Tambre2020-11-221-0/+2
| | | | | | | | | | | | | | | | | | | | | Finding the toolkit is required for Clang and is assumed to have been correctly found by FindCUDAToolkit if the CUDA language is found. Error out early with an useful error instead of failing later on due to the path not being set.
| * | CUDA: Clang CUDA 11.1 supportRaul Tambre2020-11-222-4/+6
| |/ | | | | | | | | | | | | | | | | version.txt is gone from CUDA 11.1 installations, but the rest is the same. Instead of looking for version.txt look for <CUDA path>/nvvm/libdevice, which is the main thing that Clang requires (though it also checks for the existence of bin and include). Fixes #21353.
* | Merge topic 'FindGTest-revert-no-release' into release-3.19Brad King2020-11-231-28/+12
|\ \ | | | | | | | | | | | | | | | | | | 64dc4efc51 FindGTest: Revert "Allow either "Debug" or "Release" configurations." Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5520
| * | FindGTest: Revert "Allow either "Debug" or "Release" configurations."Brad King2020-11-201-28/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert commit a064b18f85 (FindGTest: Allow either "Debug" or "Release" configurations., 2020-06-29, v3.19.0-rc1~584^2). If both configurations are found then `GTEST_LIBRARY` is populated in a way that breaks `__gtest_determine_library_type`, and the imported target is not created correctly. Fixes: #21473 Issue: #17799
* | | Merge topic 'fix-compile-db-crash' into release-3.19Brad King2020-11-233-6/+16
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | 67e2130c96 Makefiles: Fix CMAKE_EXPORT_COMPILE_COMMANDS crash with custom compile rule Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5521
| * | Makefiles: Fix CMAKE_EXPORT_COMPILE_COMMANDS crash with custom compile ruleBrad King2020-11-203-6/+16
| |/ | | | | | | Fixes: #21471
* | Merge topic 'revert-explicit-LANGUAGE-flag' into release-3.19Brad King2020-11-2020-83/+21
|\ \ | |/ |/| | | | | | | | | 30aa715fac Revert "specify language flag when source LANGUAGE property is set" Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5519
| * Revert "specify language flag when source LANGUAGE property is set"Brad King2020-11-1920-83/+21
|/ | | | | | | | | | | | | | | | | | | | | | | | | Revert commit 74b1c9fc8e (Explicitly specify language flag when source LANGUAGE property is set, 2020-06-01, v3.19.0-rc1~722^2) and the lookup tables from its two immediate ancestors. The purpose of that change was to convert an explicit `LANGUAGE` source file property into an explicit language specification compiler flag like `-x c`. This seems reasonable since the property is documented as meaning "indicate what programming language the source file is". It is also needed to help compilers deal with non-standard source file extensions they don't recognize. However, some projects have been setting `LANGUAGE C` on `.S` assembler source files to mean "use the C compiler". Passing `-x c` for them breaks the build because the `.S` sources are not written in C. These projects should be updated to use `enable_language(ASM)`, for which CMake often chooses the C compiler as the assembler when using toolchains that support it (which would have to be the case for projects using the approach). Revert the change for now to preserve the old behavior for such projects. We can re-introduce it with a policy in a future version of CMake. Fixes: #21469 Issue: #14516, #20716
* Merge topic 'ci-updates' into release-3.19Brad King2020-11-183-9/+9
|\ | | | | | | | | | | | | | | ec5223666b gitlab-ci: update macOS jobs to use Xcode 12.0 fa0c02e9df ci: update to use CMake 3.19.0 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5516
| * gitlab-ci: update macOS jobs to use Xcode 12.0Brad King2020-11-181-4/+4
| |
| * ci: update to use CMake 3.19.0Brad King2020-11-182-5/+5
|/
* CMake 3.19.0v3.19.0Brad King2020-11-181-1/+1
|
* Merge branch 'release-3.18' into release-3.19Brad King2020-11-180-0/+0
|\
| * 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
* | \ Merge topic 'rename_cuda_memcheck' into release-3.19Brad King2020-11-1811-27/+27
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | fea49b2df0 CTest: Rename CudaMemcheck to CudaSanitizer Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5514
| * | | CTest: Rename CudaMemcheck to CudaSanitizerTobias Ribizel2020-11-1711-27/+27
| | | |
* | | | Merge topic 'gitlab-ci-msvc-14.28' into release-3.19Brad King2020-11-171-4/+4
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | a282714be9 gitlab-ci: Update Windows builds to MSVC 19.28 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5513
| * | | gitlab-ci: Update Windows builds to MSVC 19.28Brad King2020-11-171-4/+4
|/ / /
* | | Merge topic 'msvc-14.28' into release-3.19Brad King2020-11-171-0/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | c862e15418 Suppress MSVC 14.28 C5105 warning triggered by Windows SDK Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5512
| * | | Suppress MSVC 14.28 C5105 warning triggered by Windows SDKBrad King2020-11-171-0/+6
|/ / / | | | | | | | | | Issue: #21446
* | | Merge topic 'xcode-clean-lib-paths' into release-3.19Craig Scott2020-11-161-10/+20
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | b1ef2fffe7 Xcode: Clean library paths to avoid linker duplicate symbol definitions Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5511
| * | | Xcode: Clean library paths to avoid linker duplicate symbol definitionsGusts Kaksis2020-11-151-10/+20
| | | |
* | | | Merge topic 'ci-fedora33' into release-3.19Brad King2020-11-1617-46/+63
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6e35919e15 gitlab-ci: use Fedora 33 to build sources 061f7d5ca3 gitlab-ci: update Linux CI to use Fedora 33 bd62d2ecf3 ci: update to Fedora 33 for Linux builds ada3170625 ci: install gmock in the Fedora 31 image 86f196f634 Tests/FindBoost/TestPython: support finding 3.8 and 3.9 6a83417908 clang-tidy: ignore new warnings from newer versions d2b648ec4c clang-tidy: ignore `misc-no-recursion` Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5504
| * | | gitlab-ci: use Fedora 33 to build sourcesBen Boeckel2020-11-131-1/+1
| | | |
| * | | gitlab-ci: update Linux CI to use Fedora 33Ben Boeckel2020-11-1311-41/+41
| | | |
| * | | ci: update to Fedora 33 for Linux buildsBen Boeckel2020-11-134-2/+5
| | | |
| * | | ci: install gmock in the Fedora 31 imageBrad King2020-11-132-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The gmock libraries are referenced by GTest's CMake package files. While at it, also explicitly install gettext. It is installed already, but make it explicit for future testing of the FindGettext module. (cherry picked from commit 585cc7c9301ff474a40d7702ce429b93f474d44f)
| * | | Tests/FindBoost/TestPython: support finding 3.8 and 3.9Ben Boeckel2020-11-121-2/+2
| | | |
| * | | clang-tidy: ignore new warnings from newer versionsBen Boeckel2020-11-121-0/+11
| | | | | | | | | | | | | | | | These warnings can be fixed in the future, but are ignored for now.
| * | | clang-tidy: ignore `misc-no-recursion`Ben Boeckel2020-11-121-0/+1
| | | | | | | | | | | | | | | | | | | | CMake has intentional recursion in its codebase, so avoid warning about occurrences.
* | | | Merge topic 'qtifw-archivegen' into release-3.19Brad King2020-11-132-0/+14
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5ab75dd7dd CPack/IFW: Locate the archivegen utility Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5503
| * | | | CPack/IFW: Locate the archivegen utilityErlend Egeberg Aasland2020-11-122-0/+14
| | | | | | | | | | | | | | | | | | | | Fixes: #21427
* | | | | Merge topic 'qtifw-4.0' into release-3.19Brad King2020-11-131-1/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 63ae96a317 CPack/IFW: Add support for QtIFW 4.0 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5502
| * | | | | CPack/IFW: Add support for QtIFW 4.0Erlend Egeberg Aasland2020-11-121-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | installerbase v4.0 segfaults on macOS if you pass `--framework-version`, so re-order flags to try `--version` first. Fixes: #21426
* | | | | | Merge topic 'doc-cstd' into release-3.19Brad King2020-11-132-4/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 48645cabe3 Help: MSVC now has C standard level flags Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5500
| * | | | | | Help: MSVC now has C standard level flagsMichael Hirsch2020-11-122-4/+4
| |/ / / / /
* | | | | | Merge topic 'xcode-compiler-id-path' into release-3.19Brad King2020-11-134-4/+4
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bcbae3f71e Xcode: Extract CMAKE_<LANG>_COMPILER from compiler id with multiple archs a070565a66 Merge branch 'FindRuby-restore-VENDORLIB_DIR' into release-3.18 3969c86b51 Merge branch 'cuda_vs_skip_computation' into release-3.18 Acked-by: Kitware Robot <kwrobot@kitware.com> 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
| * \ \ \ \ Merge branch 'cuda_vs_skip_computation' into release-3.18Brad King2020-10-275-2/+21
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !5422
* | \ \ \ \ \ Merge topic 'xcode-compiler-id-arch' into release-3.19Brad King2020-11-132-2/+9
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 98849039cc Xcode: Default to arm64 arch on Apple Silicon hosts during compiler id Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5505
| * | | | | | Xcode: Default to arm64 arch on Apple Silicon hosts during compiler idBrad King2020-11-122-2/+9
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit b6c60f14b6 (macOS: Default to arm64 architecture on Apple Silicon hosts, 2020-09-28, v3.19.0-rc1~63^2) we forgot to update the compiler id architecture selection added by commit 26673bf480 (Xcode: Explicitly specify default native architecture on macOS, 2020-07-16, v3.18.1~20^2). Issue: #21425
* | | | | | Merge topic 'FindPython-version-range-fix-tests' into release-3.19Brad King2020-11-121-16/+25
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a00603af0b FindPython: Fix version range tests Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5497
| * | | | | | FindPython: Fix version range testsMarc Chevrier2020-11-111-16/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Tests must be successful when multiple versions are installed.
* | | | | | | Merge topic 'FindRuby-vs-runtimes' into release-3.19Brad King2020-11-121-7/+13
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d4a16427e2 FindRuby: Consider more VS runtime suffix combinations Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5486
generated by cgit v0.12 at 2025-09-13 18:32:49 (GMT)