summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* libuv: Update script to get libuv 1.44.2Brad King2022-09-271-1/+1
|
* Merge topic 'flang-windows' into release-3.24Brad King2022-09-231-0/+2
|\ | | | | | | | | | | | | d34e5a98b8 LLVMFlang: Add support for Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7692
| * LLVMFlang: Add support for Windowsمهدي شينون (Mehdi Chinoune)2022-09-211-0/+2
| |
* | Merge branch 'release-3.23' into release-3.24Brad King2022-09-210-0/+0
|\ \
| * \ Merge branch 'parse-large-int' into release-3.23Brad King2022-09-204-2/+85
| |\ \ | | | | | | | | | | | | Merge-request: !7698
* | \ \ Merge topic 'parse-large-int' into release-3.24Brad King2022-09-214-2/+85
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| | | | | | | | | | | | | | 8fc822e13a file: Avoid strange istringstream crash in cmake.org binaries on Alpine Linux 31f158e4c8 cmStringAlgorithms: Add functions to parse strings to long long integers Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7698
| * | file: Avoid strange istringstream crash in cmake.org binaries on Alpine LinuxBrad King2022-09-201-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Somehow using `istringstream` and `operator >>` to parse an integer crashes on Alpine Linux, at least when compiled with the settings we use for the official `cmake.org` Linux binaries. Since commit fd0c285b12 (file: Fix types of the OFFSET and LIMIT arguments, 2022-01-04, v3.23.0-rc1~133^2), this causes the `file(READ)` command to crash when parsing its `LIMIT` or `OFFSET` argument. Parse the input string with our dedicated helper to avoid the crash. Fixes: #23872
| * | cmStringAlgorithms: Add functions to parse strings to long long integersBrad King2022-09-203-0/+77
| |/
* | Merge topic 'matlab-r2022b' into release-3.24Brad King2022-09-191-0/+1
|\ \ | | | | | | | | | | | | | | | | | | edbdfba3f5 FindMatlab: add R2022b 9.13 version map Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7683
| * | FindMatlab: add R2022b 9.13 version mapMichael Hirsch2022-09-161-0/+1
|/ /
* | Merge topic 'FindMatlab-macos-arm64' into release-3.24Brad King2022-09-151-1/+5
|\ \ | | | | | | | | | | | | | | | | | | f0edac914a FindMatlab: Add MEX binary file suffix for Apple Silicon native Matlab Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7673
| * | FindMatlab: Add MEX binary file suffix for Apple Silicon native MatlabMichael Hirsch2022-09-141-1/+5
| | | | | | | | | | | | The Matlab MEX binary file suffix is distinct for Apple Silicon.
* | | Merge topic 'link-framework-with-multi-config-postfix' into release-3.24Brad King2022-09-154-11/+23
|\ \ \ | |/ / |/| | | | | | | | | | | | | | fc06450ff4 Apple: Fix regression when linking a framework with postfix Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7675
| * | Apple: Fix regression when linking a framework with postfixMarc Chevrier2022-09-144-11/+23
|/ / | | | | | | | | | | | | Fix a regression caused by commit 40178f3c90 (cmGlobalGenerator: Add helper to split framework path, 2022-02-10, v3.24.0-rc1~661^2~1). Fixes: #23961
* | CMake 3.24.2v3.24.2Brad King2022-09-132-4/+4
| |
* | Merge topic 'fetchcontent-redirect-version-exact' into release-3.24Brad King2022-09-123-4/+14
|\ \ | | | | | | | | | | | | | | | | | | 48b380c961 FetchContent: Ignore EXACT for redirected find_package() calls Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7665
| * | FetchContent: Ignore EXACT for redirected find_package() callsCraig Scott2022-09-113-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When FetchContent_MakeAvailable() populates a dependency for which find_package() integration is enabled, all future calls to find_package() MUST succeed using the contents of the redirection directory. The generated config version file was not handling calls where the EXACT keyword was given, resulting in such calls rejecting the redirection directory's contents and continuing its search. It is not allowed to do that. Fix the generated file to also set PACKAGE_VERSION_EXACT to true so that calls with EXACT now accept it, as was originally intended. Fixes: #23950
* | | Merge topic 'FortranCInterface-LLVMFlang' into release-3.24Brad King2022-09-122-3/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 0f5b6dd215 FortranCInterface: Add support for LLVMFlang mangling Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7658
| * | | FortranCInterface: Add support for LLVMFlang manglingGilles Gouaillardet2022-09-092-3/+5
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The following `module.f90` file module mymodule contains subroutine mysub() end subroutine end module when compiled with `flang-new` (from LLVM 15.0.0) generate the `_QMmymodulePmysub` symbol. $ flang-new -c module.f90 $ nm module.o 0000000000000000 T _QMmymodulePmysub This commit fixes the regular expressions accordingly.
* | | Merge topic 'fetchcontent-unset-wrong-nested-var' into release-3.24Craig Scott2022-09-111-1/+1
|\ \ \ | |/ / |/| | | | | | | | | | | | | | d9a6e0ffc8 FetchContent: Fix unsetting wrong variable name after provider returns Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7663
| * | FetchContent: Fix unsetting wrong variable name after provider returnsCraig Scott2022-09-101-1/+1
|/ / | | | | | | | | | | | | | | | | | | | | The unset() command was using __cmake_contentNameLower before that variable was restored from the __cmake_fcCurrentVarsStack. That means if there had been a nested call to FetchContent_MakeAvailable(), the wrong variable name would have been cleared (the nested name instead of the one from the current call). That would have left the variable set upon return, blocking the dependency provider from seeing any further calls to FetchContent_MakeAvailable() in the current variable scope or below for the current dependency.
* | Merge topic 'fetchcontent-extra' into release-3.24Brad King2022-09-091-4/+4
|\ \ | | | | | | | | | | | | | | | | | | | | | 629d106c5e Help: Fix typo in FetchContent example, extras should read extra Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: hinell <al.neodim@gmail.com> Merge-request: !7657
| * | Help: Fix typo in FetchContent example, extras should read extraMathieu Malaterre2022-09-091-4/+4
| | | | | | | | | | | | | | | Amends 29e31e2825a (Packages: Integrate FetchContent and find_package(), 2022-04-28)
* | | Merge topic 'truncation_invalid' into release-3.24Brad King2022-09-098-1/+15
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bd30d20bc3 Tests: Add cases covering bad ctest output truncation types dbf840392d ctest: print error for invalid CTEST_CUSTOM_TEST_OUTPUT_TRUNCATION Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7596
| * | | Tests: Add cases covering bad ctest output truncation typesBrad King2022-09-077-0/+10
| | | | | | | | | | | | | | | | Issue: #23869
| * | | ctest: print error for invalid CTEST_CUSTOM_TEST_OUTPUT_TRUNCATIONFrank Winklmeier2022-09-071-1/+5
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Print an error message for invalid values of `CTEST_CUSTOM_TEST_OUTPUT_TRUNCATION` in a ctest dashboard script. The option was added by commit 140704d443 (ctest: add option for output truncation, 2022-03-07, v3.24.0-rc1~513^2). Fixes: #23869
* | | Merge topic 'revert-automoc-silence-warnings' into release-3.24Brad King2022-09-091-10/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | e08d34eda1 automoc: revert attempts to silence linker warning on macos Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7652
| * | | automoc: revert attempts to silence linker warning on macosBrad King2022-09-071-10/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We've made several attempts to add a dummy symbol to `mocs_compilation.cpp` when there are no automoc sources: * commit 4a9daae483 (automoc: silence linker warning on macos, 2022-05-25, v3.24.0-rc1~55^2) * commit 844244ccdc (automoc: avoid compiler warnings in linker-warning- silencing code, 2022-08-10, v3.24.1~6^2) * commit fc8628389f (automoc: avoid more compiler warnings in linker- warning-silencing code, 2022-08-29) The last attempt derives a symbol name from the path to the source file, but that breaks reproducible builds because it is not stable w.r.t. the location of the build tree. Revert all these attempts for the 3.24 release series, and return to what 3.23 and below did. Further investigation will be needed to resolve the original issue. Fixes: #23937 Issue: #23551, #23823, #23823
* | | Merge topic 'check-library-properties-fix-performances-regression' into ↵Brad King2022-09-0911-78/+59
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | release-3.24 985b4c82a6 Check link libraries properties: fix performances regression a47eef32a3 renames method FinalizeTargetCompileInfo() in FinalizeTargetConfiguration(). Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7651
| * | Check link libraries properties: fix performances regressionMarc Chevrier2022-09-077-70/+51
| | | | | | | | | | | | Fixes: #23939
| * | renames method FinalizeTargetCompileInfo() in FinalizeTargetConfiguration().Marc Chevrier2022-09-075-8/+8
| | |
* | | Merge topic 'zlib-windows-cross-compile-fix' into release-3.24Brad King2022-09-071-4/+20
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 67b6f1a09b FindZLIB: fix CMAKE_FIND_LIBRARY_PREFIXES being unset when it was empty Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7647
| * | | FindZLIB: fix CMAKE_FIND_LIBRARY_PREFIXES being unset when it was emptyDaniel Scharrer2022-09-061-4/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CMAKE_FIND_LIBRARY_PREFIXES and CMAKE_FIND_LIBRARY_SUFFIXES have different behavior when undefined and when defined but empty: Empty means to use an empty prefix/suffix while undefined means to use a hardcoded default for the platform we are running on. Unfortunately, set(a ${b}) will undefine a when b is empty, meaning that when targeting a platform where either of these variables is empty (e.g. Windows where CMAKE_FIND_LIBRARY_PREFIXES is empty) the unpatched FindZLIB code ends up unsetting that variable, causing all subsequent find_library calls to use the hardcoded default for the runtime platform (e.g. "lib" for CMAKE_FIND_LIBRARY_PREFIXES on Linux). On the other hand, set(a "${b}") will always define a to be empty but defined so we have to do this dance to fully preserve the state of these variables.
* | | | Merge branch 'release-3.23' into release-3.24Brad King2022-09-070-0/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'findCUDAToolkit_declare_deps_for_targets_once' into release-3.23Brad King2022-09-061-17/+20
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !7633
* | \ \ \ Merge topic 'findCUDAToolkit_declare_deps_for_targets_once' into release-3.24Brad King2022-09-071-17/+20
|\ \ \ \ \ | | |/ / / | |/| | / | |_|_|/ |/| | | | | | | | | | | f0918fe505 FindCUDAToolkit: Correctly state cusolver and cublas dependencies Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7633
| * | | FindCUDAToolkit: Correctly state cusolver and cublas dependenciesRobert Maynard2022-09-021-17/+20
| | | | | | | | | | | | | | | | Fixes #23920
* | | | Merge topic 'truncation_test' into release-3.24Craig Scott2022-09-0611-11/+18
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cb55d5e730 RunCMakeTest: fix Truncation test definition Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !7632
| * | | | RunCMakeTest: fix Truncation test definitionFrank Winklmeier2022-09-0511-11/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `ctest_test` and `CTestCommandLine` truncation tests had multiple problems: - escape expected result string to avoid regex matching - specify the truncation size - pass the truncation mode correctly into the test definition - use unique test names Issue: #23868
* | | | | Merge topic 'help-windows-registry' into release-3.24Craig Scott2022-09-061-64/+79
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5b30ca2436 Help: cmake-developer: Add section for Windows registry access. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7642
| * | | | | Help: cmake-developer: Add section for Windows registry access.Marc Chevrier2022-09-041-64/+79
| |/ / / / | | | | | | | | | | | | | | | Fixes: #23905
* | | | | Merge topic 'doc-fetchcontent-gtest-example' into release-3.24Craig Scott2022-09-051-2/+2
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | daa2a6cda6 Help: Fix wrong casing of GTest in FetchContent integration example Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7644
| * | | | Help: Fix wrong casing of GTest in FetchContent integration exampleCraig Scott2022-09-041-2/+2
| | |_|/ | |/| |
* | | | Merge topic 'ExternalProject-default-git-tag' into release-3.24Craig Scott2022-09-041-0/+3
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | 2a21555ea7 ExternalProject: note the default of `GIT_TAG` being `master` Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7631
| * | | ExternalProject: note the default of `GIT_TAG` being `master`Ben Boeckel2022-09-021-0/+3
|/ / / | | | | | | | | | | | | | | | Reported on Discourse: https://discourse.cmake.org/t/fetchcontent-makeavailable-invalid-reference-master/6386
* | | Merge topic 'FindPostgreSQL-brew' into release-3.24Brad King2022-09-011-0/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | f799e0f23d FindPostgreSQL: Add brew-style directories to search path Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7627
| * | | FindPostgreSQL: Add brew-style directories to search pathparkesb2022-08-311-0/+3
| | | | | | | | | | | | | | | | | | | | As of 14.5, homebrew names PostgreSQL directories with the version number, e.g., `postgresql@14`.
* | | | Merge topic 'Link-MACOSX_BUNDLE' into release-3.24Brad King2022-09-016-0/+45
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | f5a441a616 Xcode: Fix erroneous MACOSX_BUNDLE link Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7624
| * | | 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 'CMAKE_FIND_USE_INSTALL_PREFIX-support-staging-prefix' into ↵Brad King2022-08-3112-28/+157
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | release-3.24 0fc10bb19b CMAKE_FIND_USE_INSTALL_PREFIX considers CMAKE_STAGING_PREFIX 43d31c5198 cmFindBase: Refactor CMAKE_FIND_USE_INSTALL_PREFIX handling Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7623