mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-24 07:08:38 -05:00
Code Issues Packages Projects Releases Wiki Activity
60,141 Commits 2 Branches 401 Tags
07d1f4d329f0cf53ce2b55c199f7ba3186f0acee
Commit Graph

60141 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King 07d1f4d329 Merge topic 'FindRuby-doc-fix' 
0d7f40a5c4 FindRuby: Remove documentation for non-existent Ruby_ROOT_DIR

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7954
 2022-11-29 10:25:40 -05:00
Brad King 9efa0cbaf7 Merge branch 'release-3.25' 2022-11-29 10:24:23 -05:00
Brad King 44f2c8f1a4 Merge topic 'android-no-LINUX' 
19509249a5 Android: Revert setting LINUX variable on Android target systems

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Nevala <robert.nevala@king.com>
Acked-by: n00b42 <github.com@mail.msdigital.de>
Merge-request: !7963
 2022-11-29 10:24:22 -05:00
Brad King 7eb3cb19bc Merge topic 'android-no-LINUX' into release-3.25 
19509249a5 Android: Revert setting LINUX variable on Android target systems

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Nevala <robert.nevala@king.com>
Acked-by: n00b42 <github.com@mail.msdigital.de>
Merge-request: !7963
 2022-11-29 10:24:21 -05:00
Brad King dd9d1a27a4 Merge branch 'release-3.25' 2022-11-29 10:22:48 -05:00
Brad King a7a7a76e02 Merge topic 'msvc-cxx-no-optin-experimental-flag' 
12e4bc73cb MSVC: don't opt into dyndep support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7965
 2022-11-29 10:22:48 -05:00
Brad King 51235d14eb Merge topic 'msvc-cxx-no-optin-experimental-flag' into release-3.25 
12e4bc73cb MSVC: don't opt into dyndep support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7965
 2022-11-29 10:22:47 -05:00
Brad King d8967ad917 Merge branch 'release-3.25' 2022-11-29 10:15:57 -05:00
Brad King 4751c9399e Merge topic 'revert-find_library-msvc-libfoo.a' 
955d6245c1 MSVC: Revert "Teach find_library to consider the 'libfoo.a' naming convention"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7962
 2022-11-29 10:15:57 -05:00
Brad King 4c2952c5cb Merge topic 'revert-find_library-msvc-libfoo.a' into release-3.25 
955d6245c1 MSVC: Revert "Teach find_library to consider the 'libfoo.a' naming convention"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7962
 2022-11-29 10:15:55 -05:00
Brad King ee28b8c532 Merge branch 'release-3.25' 2022-11-29 10:13:58 -05:00
Brad King 07fb14ca8c Merge branch 'release-3.24' 2022-11-29 10:13:56 -05:00
Brad King 30e5ef9659 Merge branch 'release-3.24' into release-3.25 2022-11-29 10:13:42 -05:00
Brad King 500634e676 Merge branch 'release-3.25' 2022-11-29 10:06:53 -05:00
Brad King 1efae6d4a7 Merge topic 'mingw-windres' 
b47092fddb MinGW: Fix regression when windres is not found

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7964
 2022-11-29 10:06:53 -05:00
Brad King 25f6f98eb1 Merge topic 'mingw-windres' into release-3.25 
b47092fddb MinGW: Fix regression when windres is not found

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7964
 2022-11-29 10:06:52 -05:00
Craig Scott 512056158f Merge topic 'doc-add_compile_options-example' 
f03a1833e2 Help: Update compiler-specific add_compile_options() example and prose

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7959
 2022-11-29 06:35:55 -05:00
Kitware Robot 9553e72b0d CMake Nightly Date Stamp 2022-11-29 00:01:08 -05:00
Brad King 0674870892 Merge branch 'mingw-windres' into release-3.24 
Merge-request: !7964
 2022-11-28 19:10:20 -05:00
Brad King b47092fddb MinGW: Fix regression when windres is not found 
The fix in commit e9755bc7c1 (MinGW: Restore using windres when
toolchain-prefixed name is not available, 2022-08-15, v3.24.1~4^2)
incorrectly listed two entries in `CMAKE_RC_COMPILER_INIT`, which is
only meant to have one value.  Revise the logic to support multiple
platform-specific names for the Windows Resource Compiler while still
only using one name as the fallback when it is not found.

Fixes: #24190
Issue: #23841
 2022-11-28 19:09:04 -05:00
Ben Boeckel 12e4bc73cb MSVC: don't opt into dyndep support 
Instead, just set the variables for how scanning works since that is
part of the compiler mechanisms.

Fixes: #24198
 2022-11-28 18:02:51 -05:00
Michael Hirsch f03a1833e2 Help: Update compiler-specific add_compile_options() example and prose 
Avoid hard-coding a warning-as-error flag now that CMake offers a
first class abstraction for that.

Also mention some relevant generator expressions which can be used
to provide even more specific targeting with language-specific flags.

Fixes: #24200
 2022-11-29 09:12:17 +11:00
Brad King 19509249a5 Android: Revert setting LINUX variable on Android target systems 
Since commit 62cd3904bf (variable: Set LINUX variable on Linux target
systems, 2022-08-10, v3.25.0-rc1~320^2), the `Platform/Android` module
inherits the `LINUX` variable setting from `Platform/Linux`.  While
Android may use a Linux kernel, `CMAKE_SYSTEM_NAME` is not `Linux`, and
the platform does not follow conventions of most Linux distributions.

Fixes: #24196
 2022-11-28 16:58:54 -05:00
Brad King 955d6245c1 MSVC: Revert "Teach find_library to consider the 'libfoo.a' naming convention" 
Revert commit be848a71b0 (MSVC: Teach find_library to consider the
'libfoo.a' naming convention, 2022-09-19, v3.25.0-rc1~111^2).  When
targeting the MSVC ABI, this causes GNU-ABI libraries to be found in
cases they were not previously, and broke existing builds.  Revert the
change pending further discussion on how to handle the motivating use
case.

Issue: #23975
Fixes: #24168
 2022-11-28 15:42:27 -05:00
Brad King 2d373b64ea Merge topic 'ArgumentFlags-enum-values' 
ab5aeca849 Help: Clarify behavior of BEFORE with target_compile_options()
dd3482f675 cmTargetPropCommandBase: Restore ArgumentFlags enum value bool logic

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7956
 2022-11-28 12:07:30 -05:00
Hannes Braun 0d7f40a5c4 FindRuby: Remove documentation for non-existent Ruby_ROOT_DIR 
Documentation was added by commit 905d5667e8 (FindRuby: Add support for
RVM installations, 2020-03-23, v3.18.0-rc1~497^2), but this feature was
never implemented.

Closes: #21528
 2022-11-28 10:35:00 -05:00
Kitware Robot b4e373aa9d CMake Nightly Date Stamp 2022-11-28 00:01:19 -05:00
Craig Scott ab5aeca849 Help: Clarify behavior of BEFORE with target_compile_options() 2022-11-27 20:35:14 +11:00
Craig Scott dd3482f675 cmTargetPropCommandBase: Restore ArgumentFlags enum value bool logic 
The values of the cmTargetPropCommandBase::ArgumentFlags enum
are combined in boolean OR and AND operations in various places.
That used to be valid, but some values were added over time which did
not preserve support for such boolean logic. Update the enum values
such that they are increasing powers of 2 to restore that capability.

Fixes: #24199
 2022-11-27 20:17:32 +11:00
Kitware Robot 00630bbac7 CMake Nightly Date Stamp 2022-11-27 00:01:08 -05:00
Kitware Robot e35772d96a CMake Nightly Date Stamp 2022-11-26 00:01:14 -05:00
Kitware Robot b92d0971db CMake Nightly Date Stamp 2022-11-25 00:01:06 -05:00
Kitware Robot 93ded7304a CMake Nightly Date Stamp 2022-11-24 00:01:11 -05:00
Brad King 9b9a421668 Merge topic 'find_cuda_toolkit_support_symlink_math_dirs' 
989d50d7fc FindCUDAToolkit: Support nvhpc splayed layouts without symlinks
207518b6e8 FindCUDAToolkit: Handle CUDAToolkit_TARGET_DIR dir being a symlink

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7945
 2022-11-23 07:11:59 -05:00
Brad King c924d33bec Merge topic 'cxxmodule-module-support-tweaks' 
c53748cc09 Tests/RunCMake/CXXModules: mark IMPORTED targets as INTERFACE
a971fcfde7 cmNinjaNormalTargetGenerator: use `cmStrCat`
b7509d6bf8 cmNinjaNormalTargetGenerator: fix grammar in verbose comment
0015cb95de cmGlobalNinjaGenerator: fix comment typo

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7943
 2022-11-23 07:10:52 -05:00
Brad King 22fdf42e92 Merge branch 'release-3.25' 2022-11-23 07:09:10 -05:00
Brad King af937d2933 Merge topic 'try_compile-copy-config' 
80fc564dd7 try_compile: Restore COPY_FILE with CMAKE_TRY_COMPILE_CONFIGURATION

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Acked-by: Robert Maynard <robertjmaynard@gmail.com>
Merge-request: !7948
 2022-11-23 07:09:10 -05:00
Brad King 90907c8ff9 Merge topic 'try_compile-copy-config' into release-3.25 
80fc564dd7 try_compile: Restore COPY_FILE with CMAKE_TRY_COMPILE_CONFIGURATION

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Acked-by: Robert Maynard <robertjmaynard@gmail.com>
Merge-request: !7948
 2022-11-23 07:09:09 -05:00
Brad King a195dd2a6c Merge branch 'release-3.25' 2022-11-23 07:08:02 -05:00
Brad King 7c462e36c9 Merge topic 'XCode-XCODE_LINK_BUILD_PHASE_MODE-and-LINK_LIBRARY-genex' 
61075d2d7b XCode: ensure LINK_LIBRARY genex is usable with XCODE_LINK_BUILD_PHASE_MODE

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7947
 2022-11-23 07:08:01 -05:00
Brad King 3bb47e43f0 Merge topic 'XCode-XCODE_LINK_BUILD_PHASE_MODE-and-LINK_LIBRARY-genex' into release-3.25 
61075d2d7b XCode: ensure LINK_LIBRARY genex is usable with XCODE_LINK_BUILD_PHASE_MODE

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7947
 2022-11-23 07:08:00 -05:00
Kitware Robot 7c39301ebf CMake Nightly Date Stamp 2022-11-23 00:01:14 -05:00
Brad King 80fc564dd7 try_compile: Restore COPY_FILE with CMAKE_TRY_COMPILE_CONFIGURATION 
Since commit 0c141b0393 (try_compile: Record output location instead of
reverse computing it, 2022-08-31, v3.25.0-rc1~154^2) we always look for
the "Debug" configuration's output binary from the test project.
Restore looking for the `CMAKE_TRY_COMPILE_CONFIGURATION`.

Fixes: #24180
 2022-11-22 11:26:28 -05:00
Marc Chevrier 61075d2d7b XCode: ensure LINK_LIBRARY genex is usable with XCODE_LINK_BUILD_PHASE_MODE 
Fixes: #24176
 2022-11-22 16:44:45 +01:00
Brad King 1f9ee2b8df Merge branch 'release-3.25' 2022-11-22 09:51:59 -05:00
Brad King a27663621f Merge topic 'cxxmodules-doc-msvc-modmapfmt' 
19fc1ba630 Help/dev/experimental: document the `msvc` module map format

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7944
 2022-11-22 09:51:59 -05:00
Brad King 3d1f91a245 Merge topic 'cxxmodules-doc-msvc-modmapfmt' into release-3.25 
19fc1ba630 Help/dev/experimental: document the `msvc` module map format

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7944
 2022-11-22 09:51:58 -05:00
Brad King e1b757602c Merge topic 'find_dependency-dedup' 
fb9a3d0c7d find_dependency: Avoid repeating identical dependency searches
5fbda0f572 find_dependency: Unset temporary variables before returning
591b75ee17 Tests: Add case covering transitive find_dependency calls

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7936
 2022-11-22 09:50:12 -05:00
Brad King 1f6a6d6aad Merge topic 'use-rsp-in-makefiles' 
b1a3a38e03 Makefiles: Name object response files with .rsp extension

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: kossnikita <kossnikita@gmail.com>
Merge-request: !7942
 2022-11-22 09:48:53 -05:00
Brad King 62172b4ab7 Merge topic 'custom-command-comment-genex' 
26d813092b add_custom_{command,target}: add genex support for COMMENT
60a5a39022 cmCustomCommandGenerator: refactor GetComment to return std::string

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !7887
 2022-11-22 09:47:59 -05:00