summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'ExternalProject-revert-install' into release-3.25Brad King2023-03-035-5/+18
|\ | | | | | | Merge-request: !8279
| * ExternalProject: Restore driving install through build systemBrad King2023-03-025-5/+18
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert commit 66b5d51f38 (ExternalProject: Install CMake projects using 'cmake --install', 2022-09-08, v3.25.0-rc1~150^2). It changed the ExternalProject install step command from: cmake --build <dir> --target install --config <cfg> to: cmake --install <dir> --config <cfg> The latter command no longer runs the external project build system during the install step. We could consider using the commands: cmake --build <dir> --target all --config <cfg> cmake --install <dir> --config <cfg> as the install step, but if `CMAKE_SKIP_INSTALL_ALL_DEPENDENCY` is used in the external project, that can change semantics too. Revert the original change pending further investigation on other ways to support its motivating use case. Add a test covering the previously-regressed use case. Fixes: #24567 Issue: #23946
* Merge topic 'backport-3.25-curl-noproxy-fix' into release-3.25Brad King2023-02-171-10/+35
|\ | | | | | | | | | | ccdc358f49 curl: Backport upstream curl fixes for no_proxy to CMake 3.25 release Merge-request: !8223
| * curl: Backport upstream curl fixes for no_proxy to CMake 3.25 releaseBrad King2023-02-171-10/+35
|/ | | | | | | | | | | | | CMake 3.25 updated to curl 7.86, which had some `no_proxy` regressions. Backport upstream curl fixes: * commit `b830f9ba9` (noproxy: fix tail-matching) * commit `b1953c193` (noproxy: tailmatch like in 7.85.0 and earlier) * commit `60453483b` (noproxy: guard against empty hostnames) CMake 3.26 already updated to curl 7.87, and has the fixes. Fixes: #24426
* Merge branch 'android-ndk-legacy-toolchain' into release-3.25Brad King2023-02-062-1/+3
|\ | | | | | | Merge-request: !8170
| * Android: Provide CMAKE_ANDROID_NDK_VERSION with NDK legacy toolchain fileBrad King2023-02-062-1/+3
|/ | | | | | | | | | | | | | | | This variable has been provided since commit 746906242d (Android: Detect NDK version number, 2021-02-26, v3.20.0-rc3~1^2~3) when using CMake's NDK support or the modern NDK toolchain file. Since commit 005e2cdfb0 (Android: Do not use gold for ndk >= r22, 2021-02-26, v3.20.0-rc3~1^2) we need the value in our compiler/platform information files, so provide it when using the NDK legacy toolchain file too. Revert commit 1c86e397fe (Android/Clang: Tolerate undefined CMAKE_ANDROID_NDK_VERSION, 2022-09-16, v3.25.0-rc1~118^2) since the variable should now always be defined. Issue: #21772 Fixes: #24386
* Merge topic 'FindPython-CMP0007-NEW' into release-3.25Brad King2023-01-241-0/+2
|\ | | | | | | | | | | | | 486b3c0850 FindPython: Policy CMP0007 must be set to NEW Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8104
| * FindPython: Policy CMP0007 must be set to NEWMarc Chevrier2023-01-211-0/+2
| | | | | | | | Fixes: #24306
* | Merge topic 'cxxmodules-ninja-1.11' into release-3.25Brad King2023-01-244-12/+18
|\ \ | | | | | | | | | | | | | | | | | | 0512428ad9 Ninja: require Ninja 1.11 for C++ module support Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8099
| * | Ninja: require Ninja 1.11 for C++ module supportBen Boeckel2023-01-234-12/+18
| |/ | | | | | | | | See: https://gitlab.kitware.com/cmake/cmake/-/issues/18355#note_1296721 See: https://github.com/ninja-build/ninja/pull/1937
* | Merge topic 'FindOpenSP-pkg-config-hints' into release-3.25Brad King2023-01-231-34/+39
|\ \ | |/ |/| | | | | | | | | 3b1c19f00a FindOpenSP: Use pkg-config only as hints for main code path Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8097
| * FindOpenSP: Use pkg-config only as hints for main code pathKefu Chai2023-01-201-34/+39
|/ | | | | | | | | | | | | | | | | | | | | | | | | | before this change, pkg_check_modules(.. IMPORTED_TARGET GLOBAL) is used for creating an imported target from which another imported interface library named OpenSP::OpenSP is created. but pkg-config does not account for all of CMake's other search behavior controls, such as CMAKE_FIND_ROOT_PATH. neither does it export the full path with OpenSP_LIBRARY. after this change, the paths found by pkg-config are only used as hints for the find_*() commands. and some cleanup are included: * be QUIET when calling find_package(PkgConfig ..) and pkg_check_modules(..) as they are distracting from user's point of view. what matters is the output of find_package_handle_standard_args() * parse the version and check for the existance of symbol as long as header path is found. because they only use header files. * define OpenSP_LIBRARY as long as it exists. this just follows the convention. as OpenSP_FOUND implies a valid OpenSP_LIBRARY. * wrap and intent multi-line command calls for better readability * check OpenSP_FOUND before adding OpenSP::OpenSP, it's more idiomatic. Fixes: #24313 Signed-off-by: Kefu Chai <tchaikov@gmail.com>
* CMake 3.25.2v3.25.2Brad King2023-01-192-1/+5
|
* Merge branch 'backport-FindCUDAToolkit-cuda-12-nvToolsExt' into release-3.25Brad King2023-01-171-1/+1
|\ | | | | | | Merge-request: !8076
| * FindCUDAToolkit: Handle CUDA::nvToolsExt not existingRobert Maynard2023-01-161-1/+1
| | | | | | | | Fixes #24275
* | Merge branch 'release-3.24' into release-3.25Brad King2023-01-170-0/+0
|\ \
| * \ Merge branch 'doc-header-only' into release-3.24Brad King2023-01-131-1/+1
| |\ \ | | | | | | | | | | | | Merge-request: !8071
* | \ \ Merge topic 'doc-header-only' into release-3.25Brad King2023-01-171-1/+1
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| | | | | | | | 93696d0f2e Help: Restore cmake-buildsystem(7) header-only library example Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8071
| * | Help: Restore cmake-buildsystem(7) header-only library exampleBrad King2023-01-131-1/+1
| |/ | | | | | | | | | | | | | | | | | | | | | | Since commit 4391913133 (Add INTERFACE libraries to generated buildsystem if they have SOURCES, 2020-07-20, v3.19.0-rc1~346^2~1) the "Eigen" example in the `cmake-buildsystem(7)` manual is supposed to show a header-only library in which the headers are attached as sources to be edited in IDEs. This was accidentally broken by commit 4b25a0d512 (Help/manual: Update header-only library example, 2022-04-22, v3.24.0-rc1~220^2) when updating the example to use a `FILE_SET`. Fixes: #24319
* | Merge topic 'try_run-cross-compile' into release-3.25Brad King2023-01-133-6/+18
|\ \ | | | | | | | | | | | | | | | | | | | | | 2f85ec0a37 try_run: Avoid crash in keyword-dispatched signature when cross-compiling Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !8066
| * | try_run: Avoid crash in keyword-dispatched signature when cross-compilingBrad King2023-01-123-6/+18
| | | | | | | | | | | | | | | | | | | | | | | | Since commit aa9220d3a0 (try_compile: Add keyword-dispatched signature, 2022-09-02, v3.25.0-rc1~178^2) the `DoNotRunExecutable` code path may be reached with no single source-file argument. Do not assume it exists. Fixes: #24295
* | | Merge topic 'implicit-includes' into release-3.25Brad King2023-01-133-6/+7
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 607bccb4ef Restore implicit include directory extraction for adaptive relative paths Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !8067
| * | | Restore implicit include directory extraction for adaptive relative pathsBrad King2023-01-123-6/+7
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the logic added by commit ef41d49812 (Fix implicit include directory extraction for adaptive relative paths, 2019-04-08, v3.14.2~5^2) to account for the new `try_compile` work directory used for the ABI check since commit 2edf0fc6d7 (Modules: Use new keyword-dispatched try_compile signature, 2022-09-13, v3.25.0-rc1~144^2). Paths relative to the work directory will now have one more `../` in them, so update the test data to match. Fixes: #24279
* | | Merge topic 'IntelLLVM-msvc-no-cxx11' into release-3.25Brad King2023-01-131-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 88f9fdcb03 IntelLLVM: Avoid unnecessary -Qstd=c++11 flag on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8069
| * | | IntelLLVM: Avoid unnecessary -Qstd=c++11 flag on WindowsBrad King2023-01-121-2/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | The IntelLLVM compiler, for compatibility with MSVC on Windows, always runs with support for at least C++14. The `-Qstd=c++11` flag just causes a warning that it is unused. Fixes: #24316
* | | Merge branch 'release-3.24' into release-3.25Brad King2023-01-130-0/+0
|\ \ \ | | |/ | |/|
| * | Merge branch 'release-3.23' into release-3.24Brad King2023-01-120-0/+0
| |\ \
| | * \ Merge branch 'backport-IntelLLVM-no-icpx-on-Windows' into release-3.23Brad King2023-01-121-1/+7
| | |\ \ | | | | | | | | | | | | | | | Merge-request: !8041
| * | \ \ Merge branch 'backport-IntelLLVM-no-icpx-on-Windows' into release-3.24Brad King2023-01-121-1/+7
| |\ \ \ \ | | | |/ / | | |/| | | | | | | Merge-request: !8041
* | | | | Merge topic 'IntelLLVM-no-icpx-on-Windows' into release-3.25Brad King2023-01-132-3/+10
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 870d89627f Help: Clarify compiler id distinction between Intel Classic and IntelLLVM ea4cfb3b53 Merge branch 'backport-IntelLLVM-no-icpx-on-Windows' 8834e4d6a5 IntelLLVM: Avoid finding not-yet-supported icpx on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !8041
| * | | | Help: Clarify compiler id distinction between Intel Classic and IntelLLVMMichael Hirsch2023-01-121-2/+3
| | | | |
| * | | | Merge branch 'backport-IntelLLVM-no-icpx-on-Windows'Brad King2023-01-121-1/+7
| |\ \ \ \ |/ / / / / | | | _ / | | | /
| * | | IntelLLVM: Avoid finding not-yet-supported icpx on WindowsMichael Hirsch2023-01-121-1/+7
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | Intel oneAPI 2023.0 added the `icpx` compiler front-end on Windows. It uses a GNU-like command-line, and is not yet supported by CMake. Avoid finding `icpx` as the CXX compiler on Windows until support is added. Fixes: #24266 Issue: #24314
* | | Merge topic 'FindBoost-1.81' into release-3.25Brad King2023-01-121-2/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | a97032c4e7 FindBoost: Add Boost 1.81 support Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Christoph Grüninger <foss@grueninger.de> Merge-request: !8056
| * | | FindBoost: Add Boost 1.81 supportleha-bot2023-01-111-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the list of known versions. There is a new header-only library, Boost.URL. It has no dependencies and has a core header `<boost/url.hpp>`. Run the command cmake -DBOOST_DIR=/path/to/boost_1_81_0 \ -P Utilities/Scripts/BoostScanDeps.cmake to extract dependencies from the 1.81.0 source tree. They are the same as 1.80's dependencies, so just update the version check for warning about newer versions.
* | | | Merge branch 'release-3.24' into release-3.25Brad King2023-01-120-0/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'fix-cmzlib-crc32-fn-mangling' into release-3.24Brad King2023-01-121-2/+1
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !8049
* | \ \ \ Merge topic 'fix-cmzlib-crc32-fn-mangling' into release-3.25Brad King2023-01-121-2/+1
|\ \ \ \ \ | | |/ / / | |/| / / | |_|/ / |/| | | | | | | | | | | 7d92e363a2 zlib: Fix typo in mangling the crc32() function Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8049
| * | | zlib: Fix typo in mangling the crc32() functionleha-bot2023-01-111-2/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | Fix the mangling of `crc32` by commit 29c578c8fb (zlib: Mangle symbols to avoid conflict with external transitive dependencies, 2022-06-10, v3.24.0-rc1~7^2). Fixes: #24281
* | | Merge branch 'release-3.24' into release-3.25Brad King2023-01-110-0/+0
|\ \ \ | |/ /
| * | Merge branch 'test-git-local-defaultBranch' into release-3.24Brad King2023-01-111-1/+1
| |\ \ | | | | | | | | | | | | Merge-request: !8060
* | \ \ Merge branch 'test-git-local-defaultBranch' into release-3.25Brad King2023-01-111-1/+1
|\ \ \ \ | | |/ / | |/| | | | | | Merge-request: !8060
| * | | Tests: Fix CTest.UpdateGIT under repo-local defaultBranch configBrad King2023-01-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The default branch detection added by commit 26ec2e2b0c (Tests: Update CTest.UpdateGIT test for custom defaultBranch, 2020-12-02, v3.20.0-rc1~355^2) fails if the test is run inside a Git work tree whose `.git` directory configures a `defaultBranch` that is different from the global or system-wide value. Fix the detection to ignore the locally configured value so that we match the `git init` decision.
* | | | Merge topic 'doc-SYSTEM' into release-3.25Craig Scott2022-12-199-64/+82
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dfab263825 Help: Clarify and update SYSTEM-related docs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8027
| * | | | Help: Clarify and update SYSTEM-related docsCraig Scott2022-12-179-64/+82
| | | | |
* | | | | Merge topic 'code-comment-typos' into release-3.25Craig Scott2022-12-192-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a817948423 Code comments: Fix trivial typos Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8030
| * | | | | Code comments: Fix trivial typosCraig Scott2022-12-172-2/+2
| |/ / / /
* | | | | Merge topic 'doc-updates' into release-3.25Marc Chevrier2022-12-181-11/+11
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | 22d36aa0f8 Help: string(JSON): avoid duplicate labels Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8028
| * | | | Help: string(JSON): avoid duplicate labelsMarc Chevrier2022-12-171-11/+11
|/ / / /
* | | | Merge topic 'doc-updates' into release-3.25Craig Scott2022-12-171-6/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2ee845c0a5 Help: Add version information for SYSTEM option of add_subdirectory Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8025
generated by cgit v0.12 at 2025-03-13 04:00:08 (GMT)