summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Xcode: Fix erroneous MACOSX_BUNDLE linkMarc Chevrier2022-08-316-0/+45
| | | | | | | | Refactoring in commit a2cfa2da4f (GenEx/LINK_LIBRARY: Add features for framework support on Apple, 2022-02-10, v3.24.0-rc1~661^2) accidentally removed a `GetParentDirectory` call. Restore it. Fixes: #23891
* Merge topic 'correct_cupti_search_paths' into release-3.24Craig Scott2022-08-261-1/+1
|\ | | | | | | | | | | | | 1f3c3589f1 FindCUDAToolkit: Search the cuda toolkit include path for cupti Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7608
| * FindCUDAToolkit: Search the cuda toolkit include path for cuptiRobert Maynard2022-08-241-1/+1
| |
* | Merge topic 'file-set-source-group' into release-3.24Kyle Edwards2022-08-258-5/+44
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 970052fedd FILE_SET: Fix source group detection bcc3965813 Tests: Fix VS10Project SourceGroupTreeCMakeLists check Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7609
| * | FILE_SET: Fix source group detectionKyle Edwards2022-08-246-1/+39
| | | | | | | | | | | | | | | | | | | | | Call MatchChildrenFiles() instead of MatchesFiles() in order to account for files being in subgroups of source groups. Fixes: #23880
| * | Tests: Fix VS10Project SourceGroupTreeCMakeLists checkKyle Edwards2022-08-242-4/+5
|/ / | | | | | | | | Fix an `IN LISTS` loop, fix a variable check, and escape backslashes in the regex used to search for source group names.
* | Merge topic 'ci-msvc-14.33' into release-3.24Brad King2022-08-222-23/+44
|\ \ | | | | | | | | | | | | | | | | | | | | | b87645b6a5 gitlab-ci: Update non-packaging Windows builds to MSVC 14.33 toolset cb8b27a901 gitlab-ci: Use separate MSVC toolset specification for packaging jobs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7597
| * | gitlab-ci: Update non-packaging Windows builds to MSVC 14.33 toolsetBrad King2022-08-191-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | Restore the change from commit 6f17996edc (gitlab-ci: Update Windows builds to MSVC 14.33 toolset, 2022-08-15, v3.24.1~3^2), but not for packaging jobs. `cmake-gui` is still buggy when compiled with the newer toolset. Issue: #23859
| * | gitlab-ci: Use separate MSVC toolset specification for packaging jobsBrad King2022-08-192-19/+40
| | | | | | | | | | | | | | | | | | | | | This will be useful for testing CMake with one version of MSVC while packaging the official binaries with another version. Issue: #23859
* | | Merge topic 'doc-ctest_test-output-control' into release-3.24Craig Scott2022-08-201-2/+5
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | fadc93286a Help: Add crossrefs to ctest output control options 8981e88b18 Help: Add missing closing quote on C++ example Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7595
| * | Help: Add crossrefs to ctest output control optionsCraig Scott2022-08-191-1/+4
| | |
| * | Help: Add missing closing quote on C++ exampleCraig Scott2022-08-191-1/+1
| |/
* | Merge topic 'doc-var-refs' into release-3.24Brad King2022-08-191-6/+8
|\ \ | | | | | | | | | | | | | | | | | | 159acea394 Help: Clarify that variable references may use cache entries Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7589
| * | Help: Clarify that variable references may use cache entriesBrad King2022-08-181-6/+8
| |/ | | | | | | | | | | | | | | | | Clarify in `cmake-language(7)` that a variable lookup may use a cache entry if the variable is not set. Fix misleading text in added by commit 8ba2a8d4a4 (Help: short/long variable reference in if command, 2018-11-01, v3.14.0-rc1~408^2~2). Fixes: #23863
* | Merge topic 'ci-cmake-update' into release-3.24Brad King2022-08-194-9/+10
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 05a1464689 ci: use CMake 3.24.1 c3793b4157 CMake 3.24.1 Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7590
| * | ci: use CMake 3.24.1Brad King2022-08-182-6/+6
| |/
| * CMake 3.24.1v3.24.1Brad King2022-08-172-3/+4
|/
* Merge topic 'revert-ci-msvc-14.33' into release-3.24Brad King2022-08-171-7/+7
|\ | | | | | | | | | | | | 3a7202bfc7 gitlab-ci: Revert Windows builds from MSVC 14.33 to MSVC 14.32 toolset Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7586
| * gitlab-ci: Revert Windows builds from MSVC 14.33 to MSVC 14.32 toolsetBrad King2022-08-171-7/+7
|/ | | | | | | | | | Revert commit 6f17996edc (gitlab-ci: Update Windows builds to MSVC 14.33 toolset, 2022-08-15). A `cmake-gui` built with the MSVC 14.33 toolset emits spurious errors when configuring CMake projects, even when the adjacent `cmake` binary succeeds reliably. Revert to the known-working MSVC 14.32 toolset pending further investigation. Issue: #23859
* Merge topic 'FindVulkan-tolerate-FATAL_ERROR' into release-3.24Brad King2022-08-172-0/+15
|\ | | | | | | | | | | | | | | 9063674517 Help: Add 3.24 release note about FindVulkan component enforcement bc01362368 FindVulkan: Restore tolerance of unknown FATAL_ERROR component Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7583
| * Help: Add 3.24 release note about FindVulkan component enforcementBrad King2022-08-171-0/+5
| | | | | | | | | | | | | | | | Since commit 6e4d20921d (FindVulkan: Add component for `shaderc_combined`, 2022-05-18, v3.24.0-rc1~111^2~5), the module rejects unknown components. Add a release note about this behavior change. Issue: #23849
| * FindVulkan: Restore tolerance of unknown FATAL_ERROR componentBrad King2022-08-171-0/+10
|/ | | | | | | | | | | `find_package(Vulkan REQUIRED FATAL_ERROR)` calls exist in the wild, but `find_package` does not have a `FATAL_ERROR` option. We silently tolerated such calls prior to commit 6e4d20921d (FindVulkan: Add component for `shaderc_combined`, 2022-05-18, v3.24.0-rc1~111^2~5), by treating the argument as a component and ignoring it. Restore tolerance by removing the component and warning about it. Fixes: #23849
* Merge topic 'ci-msvc-14.33' into release-3.24Brad King2022-08-171-7/+7
|\ | | | | | | | | | | | | 6f17996edc gitlab-ci: Update Windows builds to MSVC 14.33 toolset Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7578
| * gitlab-ci: Update Windows builds to MSVC 14.33 toolsetBrad King2022-08-161-7/+7
|/
* Merge topic 'mingw-windres' into release-3.24Brad King2022-08-161-1/+1
|\ | | | | | | | | | | | | e9755bc7c1 MinGW: Restore using windres when toolchain-prefixed name is not available Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7574
| * MinGW: Restore using windres when toolchain-prefixed name is not availableBrad King2022-08-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 55ba10dcfd (MSYS/MinGW Makefiles: Simplify selection of windres as Resource Compiler, 2022-05-26, v3.24.0-rc1~82^2) the `MinGW Makefiles` and `MSYS Makefiles` generators no longer specify the plain `windres` name for the MinGW resource compiler. Instead, the name is specified in our MinGW platform information module. After the change in commit af4adf6aa9 (MinGW: Fix default windres selection when cross-compiling, 2020-03-25, v3.18.0-rc1~492^2), when cross-compiling, we only specify the toolchain-prefixed name of the tool, which may not be available in all environments. If the toolchain-prefixed name is not available, fall back to the plain `windres` name. We already use this approach for other binutils. Fixes: #23841
* | Merge topic 'export-no-shdeps' into release-3.24Brad King2022-08-1610-0/+71
|\ \ | | | | | | | | | | | | | | | | | | 0ebff0d61a export: Restore exclusion of private shared library dependencies from checks Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7557
| * | export: Restore exclusion of private shared library dependencies from checksBrad King2022-08-1510-0/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring in commit 8c65b7042e (cmExportFileGenerator: Simplify collection of targets missing from export set, 2022-04-11, v3.24.0-rc1~281^2) accidentally dropped the behavior change from commit 0ad2a1c181 (Export: Never treat private link libraries as public package dependencies., 2013-09-24, v3.0.0-rc1~559^2). Restore the behavior and add a test. Fixes: #23838
* | | Merge topic 'automoc-silence-warnings' into release-3.24Brad King2022-08-161-9/+9
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 844244ccdc automoc: avoid compiler warnings in linker-warning-silencing code Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7558
| * | | automoc: avoid compiler warnings in linker-warning-silencing codeAlbert Astals Cid2022-08-101-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revise the code added by !7296 (merged). Make cmake_automoc_silence_linker_warning less warning-y. Fix weak-tables clang warning and copyable-polymorph clazy warning. Fixes: #23823
* | | | Merge topic 'doc-warning-as-error' into release-3.24Craig Scott2022-08-161-0/+25
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | 680fe820c6 Help: A missing cross-reference to --compile-no-warning-as-error 7ad89f8fb1 Help: List compiler IDs supported by COMPILE_WARNING_AS_ERROR Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7561
| * | | Help: A missing cross-reference to --compile-no-warning-as-errorCraig Scott2022-08-151-0/+2
| | | |
| * | | Help: List compiler IDs supported by COMPILE_WARNING_AS_ERRORCraig Scott2022-08-151-0/+23
| |/ /
* | | Merge topic 'warning-as-error-ti-compiler' into release-3.24Brad King2022-08-152-0/+12
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1cd65dfa0e TI compiler: Add support for COMPILE_WARNING_AS_ERROR target property Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Josef Angstenberger <code@jtxa.de> Merge-request: !7560
| * | | TI compiler: Add support for COMPILE_WARNING_AS_ERROR target propertyCraig Scott2022-08-112-0/+12
| |/ /
* | | Merge topic 'mingw-flto' into release-3.24Brad King2022-08-151-1/+8
|\ \ \ | |/ / |/| | | | | | | | | | | | | | 7b2a87c2eb IPO: Do not use -flto=auto with GCC 10.x on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7559
| * | IPO: Do not use -flto=auto with GCC 10.x on WindowsBrad King2022-08-101-1/+8
| |/ | | | | | | | | | | | | | | | | Revise the change from commit fe57410b33 (IPO: Use -flto=auto if compiler is GCC >= 10.1, 2022-06-22, v3.24.0-rc2~2^2) to require at least GCC 11 on Windows. Fixes: #23836 Issue: #23640
* | Merge topic 'FindThreads-msvc-no-pthread-flag' into release-3.24Brad King2022-08-091-1/+5
|\ \ | |/ |/| | | | | | | | | | | 7203963788 FindThreads: Skip check for -pthread flag when targeting the MSVC ABI Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7551
| * FindThreads: Skip check for -pthread flag when targeting the MSVC ABIBrad King2022-08-081-1/+5
|/ | | | | | | | | | Since commit 3257c34073 (FindThreads: avoid failing in AIX when using -D_XOPEN_SOURCE=500, 2022-04-30, v3.24.0-rc1~197^2) we no longer check for `pthreads.h` before checking for the `-pthread` flag. Compilers targeting the MSVC ABI do not have such a flag, so avoid performing the check unnecessarily. Fixes: #23829
* CMake 3.24.0v3.24.0Brad King2022-08-041-1/+1
|
* Merge topic 'makefile-path-consistency' into release-3.24Brad King2022-08-044-34/+48
|\ | | | | | | | | | | | | | | 5e0b06fe84 Makefiles: Restore path consistency in the global dispatch makefile Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7543
| * Makefiles: Restore path consistency in the global dispatch makefileBrad King2022-08-034-34/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Directory-level rules in `CMakeFiles/Makefile2` were previously previously written by each directory's local generator using its own decision for using relative or absolute paths. Since commit d33b12d84b (Add support for build tree symlink inside source tree, 2022-02-25, v3.24.0-rc1~583^2), each local generator explicitly models the relationship between its source and build paths, and uses this to determine when it is safe to use relative paths. Because `add_subdirectory` supports arbitrary placement of the source and build directories, different local generators may have different relationships between their source and build paths. This can cause disagreement among rules written to `CMakeFiles/Makefile2`. Restore consistency by always using the root local generator to write rules to `CMakeFiles/Makefile2`. Relative paths should always be expressed w.r.t. the top-level build directory since that is the working directory in which the `make` tool processing the file will run. Fixes: #23814
* | Merge topic 'fetchcontent-set-CMAKE_VERIFY_INTERFACE_HEADER_SETS' into ↵Brad King2022-08-047-1/+81
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | release-3.24 2a9cc3e8e8 FetchContent: Disable header set verification for dependencies Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7535
| * | FetchContent: Disable header set verification for dependenciesCraig Scott2022-08-037-1/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The CMAKE_VERIFY_INTERFACE_HEADER_SETS variable is intended to be under the control of the user. It doesn't discriminate between header sets defined in the main project and those defined by dependencies brought into the build directly via FetchContent. Developers will usually only be interested in verifying the main project's header sets, not those from dependencies. Make the variable effectively only enable header set verification of the main project by turning it off during FetchContent_MakeAvailable() calls. The user still has variables like CMAKE_PROJECT_INCLUDE and CMAKE_PROJECT_<projectName>_INCLUDE available to them if they want to enable verification of all or specific dependencies respectively. Fixes: #23808
* | | Merge topic 'doc-find_package-typo' into release-3.24Brad King2022-08-041-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 5635d33656 Help: Fix reST syntax typo in find_package docs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7540
| * | | Help: Fix reST syntax typo in find_package docsEisuke Kawashima2022-08-031-2/+2
| | | |
* | | | Merge topic 'FindLua-docfmt' into release-3.24Brad King2022-08-041-13/+16
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | 3e2094fb9b FindLua: Improve documentation formatting Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7539
| * | | FindLua: Improve documentation formattingMichael Hirsch2022-08-031-13/+16
| |/ / | | | | | | | | | | | | | | | | | | Since commit cb811d11ce (Help: Improve description of modules, 2019-04-12, v3.15.0-rc1~210^2) we've had two `::` prompts for the preformatted block listing the result variables. Convert the block to a definition list.
* | | Merge topic 'all-verify-interface-header-sets' into release-3.24Kyle Edwards2022-08-0310-0/+58
|\ \ \ | |/ / |/| | | | | | | | | | | | | | 83e44002ae VERIFY_INTERFACE_HEADER_SETS: Add verification target for all Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7536
| * | VERIFY_INTERFACE_HEADER_SETS: Add verification target for allKyle Edwards2022-08-0310-0/+58
| | | | | | | | | | | | Fixes: #23802