mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-24 23:28:32 -05:00
Code Issues Packages Projects Releases Wiki Activity
58,989 Commits 2 Branches 401 Tags
3546657cc772ea4e8ce8d5240a447623fe2bf48a
Commit Graph

58989 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kyle Edwards 3546657cc7 CMakePresets.json: Fix error message for unsupported package presets 2022-09-13 10:42:11 -04:00
Brad King 9ffd170d27 Merge topic 'FindMPI-more-robust-conditionals' 
08dece8b18 FindMPI: remove unnecessary variable expansions in conditionals
1edc2f337f FindMPI: match full language names when "simplifying"
93b5bdb8b4 FindMPI: quote literal values

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !7666
 2022-09-13 09:49:06 -04:00
Brad King 964492e663 Merge topic 'fix-commandline-test-with-symlinks' 
7b62e40a64 Tests: Fix RunCMake.CommandLine test in unusual environments

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7660
 2022-09-13 09:48:22 -04:00
Brad King 4aeb887c82 Merge topic 'ExternalProject-cmake-install' 
66b5d51f38 ExternalProject: Install CMake projects using 'cmake --install'

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !7655
 2022-09-13 09:47:31 -04:00
Brad King 358a49ef9b Merge topic 'LINUX-host' 
caffb15d09 LINUX: Set CMAKE_HOST_LINUX variable when running on a Linux host

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Acked-by: hinell <al.neodim@gmail.com>
Merge-request: !7661
 2022-09-13 09:46:01 -04:00
Brad King fd30362681 Merge topic 'ci-pwsh-cleanup' 
94b27ccc36 ci: add support for gitlab-runner 'shell = pwsh' executor
de32c8ddbe ci: start every windows job with custom environment script
906b1a0bc4 ci: allow powershell variables assigned in env scripts to persist

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !7667
 2022-09-13 09:45:13 -04:00
Kitware Robot 168e4491de CMake Nightly Date Stamp 2022-09-13 00:01:11 -04:00
Brad King 94b27ccc36 ci: add support for gitlab-runner 'shell = pwsh' executor 
Run powershell child scripts using the same powershell tool as the
parent script.
 2022-09-12 12:47:42 -04:00
Brad King de32c8ddbe ci: start every windows job with custom environment script 2022-09-12 12:45:45 -04:00
Brad King 906b1a0bc4 ci: allow powershell variables assigned in env scripts to persist 
Load env scripts with `.` sourcing instead of `Invoke-Expression`.
This allows powershell variables to persist, much like bash.

Leave helper script loading unchanged, as those scripts may set
powershell variables that we do not want to persist.
 2022-09-12 12:42:25 -04:00
Harry Mallon 66b5d51f38 ExternalProject: Install CMake projects using 'cmake --install' 
In some cases, `cmake --install .` implements additional semantics over
just `cmake --build . --target install`.  For example, using the Xcode
"new build system" with `IOS_INSTALL_COMBINED` requires special support
from `cmake --install` beyond building the `install` target.

Fixes: #23946
 2022-09-12 09:53:22 -04:00
Matthew Woehlke 7b62e40a64 Tests: Fix RunCMake.CommandLine test in unusual environments 
Modify `Tests/RunCMake/CommandLine/P_working-dir.cmake` to not spuriously
fail in environments when the build directory's nominal path is not
canonicalized (i.e. `realpath(BINDIR) != BINDIR`).
 2022-09-12 09:45:50 -04:00
Brad King 6183332c27 Merge topic 'try_compile_correctly_compute_exec_name' 
0c141b0393 try_compile: Record output location instead of reverse computing it

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7626
 2022-09-12 09:40:39 -04:00
Brad King bca403357e Merge topic 'manual-toolchain' 
004568a9f3 Help: Add links between cmake-{toolchains,presets}(7)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7650
 2022-09-12 09:39:27 -04:00
Brad King 93cd58ab86 Merge branch 'release-3.24' 2022-09-12 09:38:07 -04:00
Brad King 64f4bb5728 Merge topic 'fetchcontent-redirect-version-exact' 
48b380c961 FetchContent: Ignore EXACT for redirected find_package() calls

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7665
 2022-09-12 09:38:07 -04:00
Brad King ef75657851 Merge topic 'fetchcontent-redirect-version-exact' into release-3.24 
48b380c961 FetchContent: Ignore EXACT for redirected find_package() calls

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7665
 2022-09-12 09:38:06 -04:00
Brad King 0f8838c8d3 Merge branch 'release-3.24' 2022-09-12 09:36:07 -04:00
Brad King db715b6632 Merge topic 'FortranCInterface-LLVMFlang' 
0f5b6dd215 FortranCInterface: Add support for LLVMFlang mangling

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7658
 2022-09-12 09:36:07 -04:00
Brad King 20f36aae14 Merge topic 'FortranCInterface-LLVMFlang' into release-3.24 
0f5b6dd215 FortranCInterface: Add support for LLVMFlang mangling

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7658
 2022-09-12 09:36:06 -04:00
Ben Boeckel 08dece8b18 FindMPI: remove unnecessary variable expansions in conditionals 2022-09-12 09:35:48 -04:00
Ben Boeckel 1edc2f337f FindMPI: match full language names when "simplifying" 
There is no reason `CSharp` should go down this codepath (assuming it
ever gets here in the first place).
 2022-09-12 09:34:16 -04:00
Ben Boeckel 93b5bdb8b4 FindMPI: quote literal values 
Some projects accidentally end up doing the equivalent of `set(0 1)`
which makes things work very poorly here. Be more defensive.

See: #23954
 2022-09-12 09:32:05 -04:00
Kitware Robot 4e3e15f98f CMake Nightly Date Stamp 2022-09-12 00:01:28 -04:00
Craig Scott e9e02024b3 Merge branch 'release-3.24' 2022-09-11 18:09:11 -04:00
Craig Scott b9175800a2 Merge topic 'fetchcontent-unset-wrong-nested-var' 
d9a6e0ffc8 FetchContent: Fix unsetting wrong variable name after provider returns

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7663
 2022-09-11 18:09:11 -04:00
Craig Scott 31e832133a Merge topic 'fetchcontent-unset-wrong-nested-var' into release-3.24 
d9a6e0ffc8 FetchContent: Fix unsetting wrong variable name after provider returns

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7663
 2022-09-11 18:09:09 -04:00
Craig Scott 48b380c961 FetchContent: Ignore EXACT for redirected find_package() calls 
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
 2022-09-11 18:36:31 +10:00
Kitware Robot a09f23e8d2 CMake Nightly Date Stamp 2022-09-11 00:01:09 -04:00
Craig Scott d9a6e0ffc8 FetchContent: Fix unsetting wrong variable name after provider returns 
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.
 2022-09-10 18:23:21 +10:00
Kitware Robot 9790821368 CMake Nightly Date Stamp 2022-09-10 00:01:20 -04:00
Cristian Adam caffb15d09 LINUX: Set CMAKE_HOST_LINUX variable when running on a Linux host 
Relates: #23840
 2022-09-09 20:10:43 +02:00
Gilles Gouaillardet 0f5b6dd215 FortranCInterface: Add support for LLVMFlang mangling 
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.
 2022-09-09 10:37:56 -04:00
Hinell 004568a9f3 Help: Add links between cmake-{toolchains,presets}(7) 
Also improve formatting and add `versionadded` markup.
 2022-09-09 10:11:07 -04:00
Brad King 12de4ea2e8 Merge topic 'fphsa-error-message-empty-version-var' 
8f50f135ae FPHSA: Improve error message when VERSION_VAR is empty or has been unset()

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7527
 2022-09-09 10:06:45 -04:00
Brad King e71605dfb4 Merge topic 'BSD' 
1ea8b8ed86 BSD: Set CMAKE_HOST_BSD variable on a BSD host
288f72efea BSD: Only use BSD as variable for target BSD system

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7648
 2022-09-09 10:05:41 -04:00
Marc Chevrier 281113af87 Merge topic 'useswig-perl-module' 
5156eb5613 UseSWIG: track generated Perl module files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7654
 2022-09-09 10:04:50 -04:00
Brad King 8b72093468 Merge branch 'release-3.24' 2022-09-09 09:53:41 -04:00
Brad King 08930f76ef Merge topic 'fetchcontent-extra' 
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
 2022-09-09 09:53:41 -04:00
Brad King a2f9e674bb Merge topic 'fetchcontent-extra' into release-3.24 
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
 2022-09-09 09:53:40 -04:00
Brad King 716d89b8ab Merge branch 'release-3.24' 2022-09-09 09:52:06 -04:00
Brad King 29c0633793 Merge topic 'truncation_invalid' 
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
 2022-09-09 09:52:06 -04:00
Brad King 6695957237 Merge topic 'truncation_invalid' into release-3.24 
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
 2022-09-09 09:52:04 -04:00
Brad King 13fe11fb18 Merge branch 'release-3.24' 2022-09-09 09:50:05 -04:00
Brad King 39d2ceb4f1 Merge topic 'revert-automoc-silence-warnings' 
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
 2022-09-09 09:50:05 -04:00
Brad King 11754888a8 Merge topic 'revert-automoc-silence-warnings' into release-3.24 
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
 2022-09-09 09:50:04 -04:00
Brad King 45b7628a02 Merge branch 'release-3.24' 2022-09-09 09:48:56 -04:00
Brad King 06404a1979 Merge topic 'check-library-properties-fix-performances-regression' 
985b4c82a6 Check link libraries properties: fix performances regression
a47eef32a3 renames method FinalizeTargetCompileInfo() in FinalizeTargetConfiguration().

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7651
 2022-09-09 09:48:56 -04:00
Brad King dac4f26918 Merge topic 'check-library-properties-fix-performances-regression' into 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
 2022-09-09 09:48:55 -04:00
Mathieu Malaterre 629d106c5e Help: Fix typo in FetchContent example, extras should read extra 
Amends 29e31e2825 (Packages: Integrate FetchContent and
find_package(), 2022-04-28)
 2022-09-09 20:08:32 +10:00