summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'release-3.22'Brad King2021-10-270-0/+0
|\
| * Merge branch 'release-3.21' into release-3.22Brad King2021-10-270-0/+0
| |\
* | \ Merge branch 'release-3.21'Brad King2021-10-270-0/+0
|\ \ \ | | |/ | |/|
| * | Merge branch 'backport-3.21-vs2022' into release-3.21Brad King2021-10-272-10/+10
| |\ \ | | | | | | | | | | | | Merge-request: !6664
* | \ \ Merge branch 'release-3.22'Brad King2021-10-270-0/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge topic 'vs2022' into release-3.22Brad King2021-10-273-14/+10
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8b64fc7dbb Help: Drop 3.22 release note for VS 2022 050ed59412 Merge branch 'backport-3.21-vs2022' into vs2022 f3ddc52676 VS: Update Visual Studio 17 2022 generator for the Release Candidates Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6664
* | \ \ \ Merge topic 'vs2022'Brad King2021-10-273-14/+10
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8b64fc7dbb Help: Drop 3.22 release note for VS 2022 050ed59412 Merge branch 'backport-3.21-vs2022' into vs2022 f3ddc52676 VS: Update Visual Studio 17 2022 generator for the Release Candidates Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6664
| * | | | Help: Drop 3.22 release note for VS 2022Brad King2021-10-271-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | The 3.21.4 release will have full support, so it is not new to the 3.22 series anymore.
| * | | | Merge branch 'backport-3.21-vs2022' into vs2022Brad King2021-10-272-10/+10
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/|
| | * | VS: Update Visual Studio 17 2022 generator for the Release CandidatesBrad King2021-10-272-10/+10
| | | | | | | | | | | | | | | | | | | | Assume this is close enough to the final release to treat as non-experimental support.
* | | | CMake Nightly Date StampKitware Robot2021-10-271-1/+1
| | | |
* | | | Merge topic 'check-symbol-exists-pedantic-errors'Brad King2021-10-262-0/+26
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1ab7c3cd28 CheckSymbolExists: Work around GCC failure with -pedantic-errors option Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6656
| * | | | CheckSymbolExists: Work around GCC failure with -pedantic-errors optionTimo Röhling2021-10-222-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GCC mistakenly issues the pedantic warning "ISO C forbids conversion of function pointer to object pointer type". With -pedantic-errors in the compile flags, that diagnostic prevents check_symbol_exists() from detecting function symbols. The solution is to filter out -pedantic-errors (and -Werror, just to be future proof) before invoking try_compile(). Fixes: #13208
* | | | | Merge branch 'release-3.22'Brad King2021-10-260-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch 'release-3.21' into release-3.22Brad King2021-10-260-0/+0
| |\ \ \ \ | | | |_|/ | | |/| |
* | | | | Merge branch 'release-3.21'Brad King2021-10-260-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch 'binutils-llvm-strip' into release-3.21Brad King2021-10-221-1/+4
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !6655
* | \ \ \ \ Merge branch 'release-3.22'Brad King2021-10-260-0/+0
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge topic 'binutils-llvm-strip' into release-3.22Brad King2021-10-261-1/+4
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | 5dd981539f BinUtils: Avoid llvm-strip versions older than Clang 11 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6655
* | | | | | Merge topic 'binutils-llvm-strip'Brad King2021-10-261-1/+4
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 5dd981539f BinUtils: Avoid llvm-strip versions older than Clang 11 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6655
| * | | | | BinUtils: Avoid llvm-strip versions older than Clang 11Brad King2021-10-221-1/+4
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit cf82300a63 (BinUtils: Clarify search logic and make it more consistent, 2021-05-27, v3.21.0-rc1~119^2~2) we correctly prefer the more-specific name `llvm-strip` over `strip` when using Clang. However, `llvm-strip` from Clang versions prior to 11 require extra flags to strip everything. Until our `install(TARGETS)` logic learns to add those flags, avoid using older versions of `llvm-strip` by default. Fixes: #22785
* | | | | CMake Nightly Date StampKitware Robot2021-10-261-1/+1
| | | | |
* | | | | Merge topic 'doc-CTEST_CUSTOM_TESTS_IGNORE'Craig Scott2021-10-251-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 300d653248 Help: CTEST_CUSTOM_TESTS_IGNORE matches exact test names, not regexes Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6660
| * | | | | Help: CTEST_CUSTOM_TESTS_IGNORE matches exact test names, not regexesCraig Scott2021-10-241-1/+1
| | | | | | | | | | | | | | | | | | Fixes: #22758
* | | | | | CMake Nightly Date StampKitware Robot2021-10-251-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2021-10-241-1/+1
|/ / / / /
* | | | | CMake Nightly Date StampKitware Robot2021-10-231-1/+1
| |_|/ / |/| | |
* | | | Merge topic 'lcc-policy'Brad King2021-10-2235-4/+287
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3958ed878f LCC: Add policy CMP0129 regarding interpreting LCC as GNU Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !6643
| * | | | LCC: Add policy CMP0129 regarding interpreting LCC as GNUmakise-homura2021-10-2135-4/+287
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to MCST LCC compiler identification is now changed to LCC, there should be a way for old projects to still identify it as GNU, as it was before. This commits adds the policy: CMP0129: Compiler id for MCST LCC compilers is now LCC, not GNU. This policy controls such a behavior. OLD behaivior is to treat LCC as GNU, NEW is to treat is as LCC.
* | | | | Merge topic 'ci-openwatcom'Brad King2021-10-221-0/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b7863da78f ci: Avoid OpenWatcom linker temp file collisions Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6650
| * | | | | ci: Avoid OpenWatcom linker temp file collisionsBrad King2021-10-211-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When `wlink` needs to spill into a temporary file, code in `spillio.c` checks environment variables `WLINKTMP`, `TMP`, and `TMPDIR` to get a directory for temporary files. It searches for a name `WLK02112.xx*` that doesn't exist, where `*` starts at `a` and increments. Then it opens the file with the chosen name. This can race among concurrent `wlink` invocations that may all chose the same name before opening, and causes errors like: Error! E3008: cannot open C:\...\Temp\WLK02112.xxa : Permission denied Since `wmake` does not run parallel jobs, this normally isn't a problem. However, our test suite runs multiple tests in parallel. Each test has its own `wmake` invocation, and therefore can run `wlink` concurrently. Set `WLINKTMP=.` in the environment to tell each `wlink` to place temporary files in its own working directory, which will be different for each separate `wmake` invocation in our test suite.
* | | | | | CMake Nightly Date StampKitware Robot2021-10-221-1/+1
|/ / / / /
* | | | | Merge branch 'release-3.22'Brad King2021-10-210-0/+0
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge topic 'vs-instance' into release-3.22Brad King2021-10-2115-36/+62
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 46e9ff5729 Restore honoring CMAKE_GENERATOR_INSTANCE in toolchain file 42418b02f7 Android: Refactor sysroot detection under Visual Studio 44a86d0b38 cmake_host_system_information: Add undocumented VS_MSBUILD_COMMAND key 6999b87133 cmGlobalVisualStudio10Generator: Add method to find MSBuild early 7f730464be cmGlobalGenerator: Add method to check if generator is at least VS 10 8917b8512f cmGlobalVisualStudioVersionedGenerator: Allow repeating SetGeneratorInstance 6511654164 cmGlobalVisualStudio10Generator: Allow subclasses to reset MSBuild search Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !6646
* | \ \ \ \ Merge topic 'vs-instance'Brad King2021-10-2115-36/+62
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 46e9ff5729 Restore honoring CMAKE_GENERATOR_INSTANCE in toolchain file 42418b02f7 Android: Refactor sysroot detection under Visual Studio 44a86d0b38 cmake_host_system_information: Add undocumented VS_MSBUILD_COMMAND key 6999b87133 cmGlobalVisualStudio10Generator: Add method to find MSBuild early 7f730464be cmGlobalGenerator: Add method to check if generator is at least VS 10 8917b8512f cmGlobalVisualStudioVersionedGenerator: Allow repeating SetGeneratorInstance 6511654164 cmGlobalVisualStudio10Generator: Allow subclasses to reset MSBuild search Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !6646
| * | | | | Restore honoring CMAKE_GENERATOR_INSTANCE in toolchain fileBrad King2021-10-204-33/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert the changes from commit d5b5c19278 (cmGlobalGenerator: FindMakeProgram() before CMakeDetermineSystem, 2020-06-15, v3.19.0-rc1~619^2~3) and commit ef91fb02f3 (cmGlobalGenerator: FindMakeProgram() at a generator-specific time, 2020-11-23, v3.19.1~2^2). We must delay selecting the location of MSBuild until after an instance of Visual Studio has been selected. It is now safe to revert the ordering because the motivating use case (sysroot detection in Platform/Android-Determine) has been implemented another way. Fixes: #22782
| * | | | | Android: Refactor sysroot detection under Visual StudioBrad King2021-10-201-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 6051a49c78 (Visual Studio: Add Android support, 2020-06-12, v3.19.0-rc1~619^2) we run MSBuild to build a sample project to detect the sysroot. Previously we relied on `CMAKE_VS_MSBUILD_COMMAND` being available. That required commit d5b5c19278 (cmGlobalGenerator: FindMakeProgram() before CMakeDetermineSystem, 2020-06-15, v3.19.0-rc1~619^2~3) to make it available early enough. However, that ordering broke `CMAKE_GENERATOR_INSTANCE` so we need to prepare to revert it. Use `cmake_host_system_information` to get the location of MSBuild under a VS generator instead.
| * | | | | cmake_host_system_information: Add undocumented VS_MSBUILD_COMMAND keyBrad King2021-10-206-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using the Visual Studio generator for VS 10 or above, offer this key to get the location of the MSBuild command before the first `project()` or `enable_language()` command has finished running. This will be needed only by one of our own modules, so leave it undocumented for now.
| * | | | | cmGlobalVisualStudio10Generator: Add method to find MSBuild earlyBrad King2021-10-204-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a way to find MSBuild before the main `FindMakeProgram` code path has executed.
| * | | | | cmGlobalGenerator: Add method to check if generator is at least VS 10Brad King2021-10-202-0/+4
| | | | | |
| * | | | | cmGlobalVisualStudioVersionedGenerator: Allow repeating SetGeneratorInstanceBrad King2021-10-202-0/+9
| | | | | |
| * | | | | cmGlobalVisualStudio10Generator: Allow subclasses to reset MSBuild searchBrad King2021-10-202-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | While at it, convert to inline initialization.
* | | | | | Merge branch 'release-3.22'Brad King2021-10-210-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge topic 'doc-file-INSTALL-fix' into release-3.22Brad King2021-10-211-2/+2
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 1560265e7d Help: Fix file(INSTALL) docs w.r.t. CMAKE_INSTALL_MESSAGE Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6645
* | | | | | Merge topic 'doc-file-INSTALL-fix'Brad King2021-10-211-2/+2
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 1560265e7d Help: Fix file(INSTALL) docs w.r.t. CMAKE_INSTALL_MESSAGE Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6645
| * | | | | Help: Fix file(INSTALL) docs w.r.t. CMAKE_INSTALL_MESSAGEArcturus Arcturus2021-10-201-2/+2
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit c9568de52c (install: Add CMAKE_INSTALL_MESSAGE variable (#13761), 2014-06-24, v3.1.0-rc1~370^2~1) we incorrectly documented that `CMAKE_INSTALL_MESSAGE` controls the status message for `file(INSTALL)`. Revert that. Fixes: #17162
* | | | | Merge topic 'fix_reroot_paths'Brad King2021-10-214-2/+25
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 91ec6eee58 find_package: Don't reroot prefix that is equal to a root path Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !6644
| * | | | | find_package: Don't reroot prefix that is equal to a root pathAlexandru Croitor2021-10-204-2/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When both CMAKE_FIND_ROOT_PATH and CMAKE_PREFIX_PATH are set to /opt/my_device_sysroot, cmFindCommon::RerootPaths would only look for packages in /opt/my_device_sysroot/opt/my_device_sysroot but would not try to look in /opt/my_device_sysroot. Make sure to not reroot the prefix path in such a case. Fixes: #21937
* | | | | | Merge topic 'refactor_cuda_support_to_allow_rdc_ptx'Brad King2021-10-2116-58/+158
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 61b9764b03 CUDA: Allow both CUDA_SEPARABLE_COMPILATION and CUDA_PTX_COMPILATION Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Raul Tambre <raul@tambre.ee> Merge-request: !6594
| * | | | | | CUDA: Allow both CUDA_SEPARABLE_COMPILATION and CUDA_PTX_COMPILATIONRobert Maynard2021-10-2016-58/+158
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The target properties `CUDA_SEPARABLE_COMPILATION` and `CUDA_PTX_COMPILATION` now aren't mutually exclusive and can now be used together on the same target.