summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'FindJPEG-revert-turbo' into release-3.21Brad King2021-07-121-1/+1
|\ | | | | | | | | | | | | 0de1f1503b FindJPEG: Revert "Search for 'turbojpeg' and 'turbojpeg-static' too" Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6326
| * FindJPEG: Revert "Search for 'turbojpeg' and 'turbojpeg-static' too"Brad King2021-07-091-1/+1
| | | | | | | | | | | | | | | | | | Revert commit 74cc2e3326 (FindJPEG: Search for 'turbojpeg' and 'turbojpeg-static' too, 2021-01-09, v3.20.0-rc1~176^2) pending further investigation. The "turbo" variants are not drop-in replacements on all platforms. Fixes: #22333
* | CMake 3.21.0-rc3v3.21.0-rc3Brad King2021-07-081-1/+1
| |
* | Merge topic 'help_toplevel' into release-3.21Brad King2021-07-082-0/+20
|\ \ | | | | | | | | | | | | | | | | | | 2df4badc5f Help: Note PROJECT_IS_TOP_LEVEL behavior w.r.t. ExternalProject Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6307
| * | Help: Note PROJECT_IS_TOP_LEVEL behavior w.r.t. ExternalProjectMichael Hirsch2021-07-082-0/+20
| | | | | | | | | | | | | | | | | | | | | Extend the documentation added by commit 96a7040107 (project: Define variables indicating whether project is top level, 2021-03-24, v3.21.0-rc1~443^2) to give some examples of how the variables are set in each context.
* | | Merge topic 'doc-lang-std' into release-3.21Brad King2021-07-083-3/+54
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d69b46bf01 Help: Document when CUDA_STANDARD values were added bdb59839b9 Help: Document when OBJCXX_STANDARD values were added 627aca946b Help: Document when OBJC_STANDARD values as definition list Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6321
| * | | Help: Document when CUDA_STANDARD values were addedBrad King2021-07-081-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note that some CUDA C++ language standard levels were added before any compilers actually supported them. In such cases, the value of `CUDA_STANDARD` gracefully degrades to the highest supported by the compiler (unless `CUDA_STANDARD_REQUIRED` is enabled). Therefore we can document support for each value based on when CMake learned of it.
| * | | Help: Document when OBJCXX_STANDARD values were addedBrad King2021-07-081-1/+21
| | | |
| * | | Help: Document when OBJC_STANDARD values as definition listBrad King2021-07-081-1/+10
| | | |
* | | | Merge topic 'iar-linker-placeholder' into release-3.21Brad King2021-07-081-7/+7
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | bf810c75ac IAR: Use placeholders in linker and archiver rules Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6322
| * | | IAR: Use placeholders in linker and archiver rulesJean-Marc Hengen2021-07-081-7/+7
|/ / / | | | | | | | | | | | | | | | | | | Update the IAR linker and archiver rules to use the `<CMAKE_LINKER>` and `<CMAKE_AR>` placeholders instead of hard-coding the tool names. Fixes: #22395
* | | Merge topic 'FindCUDAToolkit-doc-version' into release-3.21Brad King2021-07-081-3/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 266fc8ada5 FindCUDAToolkit: Properly document the version support Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6320
| * | | FindCUDAToolkit: Properly document the version supportRobert Maynard2021-07-071-3/+8
| | | |
* | | | Merge branch 'release-3.20' into release-3.21Brad King2021-07-080-0/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'release-3.19' into release-3.20Brad King2021-07-080-0/+0
| |\ \ \
| | * \ \ Merge branch 'check_cxx_compiler_flag_no_normal_variable' into release-3.19Brad King2021-07-082-1/+10
| | |\ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !6318
| * | \ \ \ Merge branch 'check_cxx_compiler_flag_no_normal_variable' into release-3.20Brad King2021-07-082-1/+10
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | Merge-request: !6318
* | | | | | Merge topic 'check_cxx_compiler_flag_no_normal_variable' into release-3.21Brad King2021-07-082-1/+10
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 018d300ca0 Check*CompilerFlag: Do not set result as a normal variable too Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6318
| * | | | | Check*CompilerFlag: Do not set result as a normal variable tooRobert Maynard2021-07-082-1/+10
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was previously fixed by commit d46590910c (Check*CompilerFlag: Do not set result as a normal variable too, 2020-09-21, v3.18.3~1^2^2), but was regressed by refactoring in commit 90dead024c (CheckCompilerFlag: unified way to check compiler flags per language, 2020-09-25, v3.19.0-rc1~88^2) due to the changes being developed concurrently. Fix it again, and add a test case. Fixes: #21207
* | | | | Merge branch 'release-3.20' into release-3.21Brad King2021-07-080-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch 'backport-3.20-intel-oneapi-std-windows' into release-3.20Brad King2021-07-072-12/+4
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !6319
* | \ \ \ \ Merge topic 'intel-oneapi-std-windows' into release-3.21Brad King2021-07-082-10/+2
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 13961f3b43 Merge branch 'backport-3.20-intel-oneapi-std-windows' 5115dd1e2c IntelLLVM: Fix C/C++ standard level flags on Windows 84036d30d4 IntelLLVM: Fix C/C++ standard level flags on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6319
| * | | | | Merge branch 'backport-3.20-intel-oneapi-std-windows'Brad King2021-07-070-0/+0
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | IntelLLVM: Fix C/C++ standard level flags on WindowsBrad King2021-07-072-12/+4
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit a90d2a9eed (IntelLLVM: Add support for Intel LLVM-based compilers, 2020-11-02, v3.20.0-rc1~89^2~20) we accidentally left out activation of the C/C++ standard level selection logic when IntelLLVM is targeting the MSVC ABI. Fixes: #22388
| * | | | IntelLLVM: Fix C/C++ standard level flags on WindowsBrad King2021-07-072-10/+2
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit a90d2a9eed (IntelLLVM: Add support for Intel LLVM-based compilers, 2020-11-02, v3.20.0-rc1~89^2~20) we accidentally left out activation of the C/C++ standard level selection logic when IntelLLVM is targeting the MSVC ABI. Fixes: #22388
* | | | Merge topic 'help_cxxstd' into release-3.21Brad King2021-07-071-1/+25
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5650bebc2f Help: Note CXX_STANDARD values added vs. CMake version Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6305
| * | | | Help: Note CXX_STANDARD values added vs. CMake versionMichael Hirsch2021-07-061-1/+25
| | | | |
* | | | | Merge topic 'correct_cuda_toolkit_version_typo' into release-3.21Brad King2021-07-071-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0d54276c82 Correct CUDAToolkit_VERSION_MINOR variable name typo Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Raul Tambre <raul@tambre.ee> Merge-request: !6311
| * | | | | Correct CUDAToolkit_VERSION_MINOR variable name typoRobert Maynard2021-07-061-1/+1
| | |_|_|/ | |/| | |
* | | | | Merge topic 'cmake-presets-list-no-generator' into release-3.21Brad King2021-07-076-13/+23
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d9a3c9fad5 CMakePresets.json: Make --list-presets show presets with no generator Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6314
| * | | | | CMakePresets.json: Make --list-presets show presets with no generatorKyle Edwards2021-07-066-13/+23
| | |/ / / | |/| | | | | | | | | | | | | Fixes: #22389
* | | | | Merge topic 'xcode13-old-buildsystem' into release-3.21Brad King2021-07-071-1/+5
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | 71a2664ebb Xcode: Ignore deprecated build system Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6309
| * | | | Xcode: Ignore deprecated build systemGregor Jasny2021-07-061-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | With Xcode 13 the key to suppress the check has changed. Tested with Xcode 12.5 and 13.0-beta2.
* | | | | Merge branch 'release-3.20' into release-3.21Brad King2021-07-060-0/+0
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge branch 'backport-3.20-makefile-normalize-depfile' into release-3.20Brad King2021-07-023-6/+17
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !6297
* | \ \ \ \ Merge topic 'makefile-normalize-depfile' into release-3.21Brad King2021-07-063-6/+17
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6bc6ffb9a9 Merge branch 'backport-3.20-makefile-normalize-depfile' 6a6efdcaed Makefiles: Normalize compiler-generated depfile paths Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6297
| * \ \ \ \ \ Merge branch 'backport-3.20-makefile-normalize-depfile'Brad King2021-07-023-6/+17
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Makefiles: Normalize compiler-generated depfile pathsMarc Chevrier2021-07-023-6/+17
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Even though Makefile generators pass source files and include directories by absolute path to the compiler, the compiler may generate depfile paths relative to the current working directory. For example, `ccache` with `CCACHE_BASEDIR` may transform paths this way. When reading a depfile, convert relative dependencies to absolute paths before placing them in `compiler_depend.make`, which is later evaluated in the top-level build directory. Fixes: #22364
* | | | | | Merge topic 'ci-fixups' into release-3.21Brad King2021-07-0622-28/+49
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 46c89c77de gitlab-ci: Rename CI config variable to avoid conflict with CMAKE_BUILD_TYPE 3ede66e17a Tests: Fix newline matching in several RunCMake.* cases Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6298
| * | | | | gitlab-ci: Rename CI config variable to avoid conflict with CMAKE_BUILD_TYPEBrad King2021-07-024-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit e216b9bbd3 (cmake: Allow CMAKE_BUILD_TYPE to be set by environment variable, 2021-06-29), the `CMAKE_BUILD_TYPE` environment variable is interpreted by CMake, and can affect the test suite. Rename our CI config variable to avoid conflict.
| * | | | | Tests: Fix newline matching in several RunCMake.* casesBrad King2021-07-0218-21/+42
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The RunCMake infrastructure's `*-stdout.txt` expected output files interpret `\n` as a `\` and `n` rather than a newline. Use a literal newline instead. Otherwise the cases that were trying to match any configuration name via `[^\n]*` would fail on `RelWithDebInfo` because it contains the letter `n`.
* | | | | Merge topic 'doc-3.21-release' into release-3.21Craig Scott2021-07-062-61/+75
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 24b76eaa93 Help: Improve readability and accuracy of runtime deps-related content 308e5b30c9 Help: Tighten install(SCRIPT) wording for ALL_COMPONENTS option 52dec01729 Help: Add missing versionadded 3.21 for file(RENAME) options Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6302
| * | | | Help: Improve readability and accuracy of runtime deps-related contentCraig Scott2021-07-042-55/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Duplicated textual patterns are factored out to make the text more readable. The POST_INCLUDE_FILES and POST_EXCLUDE_FILES were also previously missing from the main syntax block for install(RUNTIME_DEPENDENCY_SET).
| * | | | Help: Tighten install(SCRIPT) wording for ALL_COMPONENTS optionCraig Scott2021-07-031-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | In particular, mention the mutually exclusive nature with the COMPONENT option. Fix the inconsistent way the versionadded details were added for that text too.
| * | | | Help: Add missing versionadded 3.21 for file(RENAME) optionsCraig Scott2021-07-031-0/+4
|/ / / /
* | | | Merge topic 'cmake-upload-junit-reports' into release-3.21Brad King2021-07-026-9/+30
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cb5c03ed04 gitlab-ci: upload JUnit reports for builds 722270ff50 ci: update to 3.21.0-rc2 for CI usage Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Craig Scott <craig.scott@crascit.com> Merge-request: !6072
| * | | | gitlab-ci: upload JUnit reports for buildsBen Boeckel2021-06-304-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | GitLab can render test results which come from JUnit files and inform which tests have started failing on an MR.
| * | | | ci: update to 3.21.0-rc2 for CI usageBen Boeckel2021-06-302-9/+9
| | | | | | | | | | | | | | | | | | | | This version includes JUnit support in CTest.
* | | | | Merge topic 'compiler-id-msvc-no-lib' into release-3.21Brad King2021-07-022-2/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e93245ec64 DetermineCompiler: Restore identification of MSVC with no INCLUDE or LIB Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6295
| * | | | | DetermineCompiler: Restore identification of MSVC with no INCLUDE or LIBBrad King2021-07-012-2/+4
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the change from commit c6aaaf066a (DetermineCompiler: Restore identification of MSVC with no INCLUDE dirs, 2021-06-29, v3.21.0-rc2~6^2) to also work with no `LIB` dirs. Add the `-c` flag to compile an object file without linking.