mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-20 21:28:23 -05:00
Code Issues Packages Projects Releases Wiki Activity
56,991 Commits 2 Branches 399 Tags
bcc3584912db48ba41112eabcd7a4b95fdf48265
Commit Graph

56991 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King bcc3584912 Merge topic 'vs-FI-space' 
20cd951c9f VS: Add compiler flag table entry for -FI followed by separate argument

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7138
 2022-04-04 09:31:55 -04:00
Brad King 788171a3c0 Merge branch 'release-3.23' 2022-04-04 09:26:58 -04:00
Brad King c7a1ccece9 Merge topic 'doc-CMP0112' 
9993774172 Help: Clarify when policy CMP0112 takes effect

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7134
 2022-04-04 09:26:58 -04:00
Brad King 7260208379 Merge topic 'doc-CMP0112' into release-3.23 
9993774172 Help: Clarify when policy CMP0112 takes effect

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7134
 2022-04-04 09:26:57 -04:00
Craig Scott 8ef33eb033 Merge branch 'release-3.23' 2022-04-04 07:46:55 -04:00
Craig Scott ce121e486c Merge topic 'doc-install-typo' 
7431759ebc Help: Fix typo in install command documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7140
 2022-04-04 07:46:55 -04:00
Craig Scott 96293e3336 Merge topic 'doc-install-typo' into release-3.23 
7431759ebc Help: Fix typo in install command documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7140
 2022-04-04 07:46:54 -04:00
Kitware Robot fd46a557c8 CMake Nightly Date Stamp 2022-04-04 00:02:47 -04:00
Eugene Shalygin 7431759ebc Help: Fix typo in install command documentation 2022-04-04 07:38:29 +10:00
Kitware Robot fff8f3bee9 CMake Nightly Date Stamp 2022-04-03 00:01:09 -04:00
Kitware Robot 6733ad4dd5 CMake Nightly Date Stamp 2022-04-02 00:01:21 -04:00
Brad King 20cd951c9f VS: Add compiler flag table entry for -FI followed by separate argument 
The MSVC `/FI` flag accepts an attached value or a following argument.
Previously our flag tables only had entries for the former.  Add
the latter.

Fixes: #23382
 2022-04-01 16:37:08 -04:00
Brad King 9993774172 Help: Clarify when policy CMP0112 takes effect 
Fixes: #23381
 2022-04-01 10:06:04 -04:00
Craig Scott 6e1be5dbef Merge topic 'doc-CMAKE_USER_MAKE_RULES_OVERRIDE' 
b1c502ff94 Help: Add missing cross-reference in CMAKE_USER_MAKE_RULES_OVERRIDE

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7133
 2022-04-01 06:08:30 -04:00
Kitware Robot 86cee7a383 CMake Nightly Date Stamp 2022-04-01 00:01:21 -04:00
Craig Scott b1c502ff94 Help: Add missing cross-reference in CMAKE_USER_MAKE_RULES_OVERRIDE 
The language-specific variable references the general one already,
but the general one did not mention the language-specific one.
Add that cross reference to improve discoverability.
 2022-04-01 08:22:40 +11:00
Brad King 63d5c8a3a8 Merge topic 'quiet_pkg-config' 
99f7d1973c FindGSL: Quiet pkg-config errors
655582e931 FindLAPACK: Quiet pkg-config errors
6dab35e25d FindBLAS: Quiet pkg-config errors
b2a7f73b55 FindGLUT: Quiet pkg-config errors

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7128
 2022-03-31 08:53:01 -04:00
Brad King 7ae3c6740b Merge topic 'string-JSON-error-modes' 
93dce4b4bf string(JSON): fix error message on invalid mode

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7130
 2022-03-31 08:52:04 -04:00
Brad King 840fb95904 Merge branch 'release-3.23' 2022-03-31 08:50:25 -04:00
Brad King ad3c50e0b4 Merge topic 'GNUInstallDirs-revert-multiarch-prefixes' 
624ec3692f GNUInstallDirs: Revert "Apply Debian multiarch LIBDIR to more prefixes"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7127
 2022-03-31 08:50:25 -04:00
Brad King 99fc8f152c Merge topic 'GNUInstallDirs-revert-multiarch-prefixes' into release-3.23 
624ec3692f GNUInstallDirs: Revert "Apply Debian multiarch LIBDIR to more prefixes"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7127
 2022-03-31 08:50:24 -04:00
Brad King 8a00633af5 Merge branch 'release-3.23' 2022-03-31 08:49:06 -04:00
Brad King 4c5c9291bc Merge topic 'help-variables-cmakecachefiledir-might-not-be-defined' 
cf4100d7da Help: Add that CMAKE_CACHEFILE_DIR might not be defined

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7125
 2022-03-31 08:49:06 -04:00
Brad King bc1cde42d4 Merge topic 'help-variables-cmakecachefiledir-might-not-be-defined' into release-3.23 
cf4100d7da Help: Add that CMAKE_CACHEFILE_DIR might not be defined

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7125
 2022-03-31 08:49:05 -04:00
Brad King a3cc30c350 Merge branch 'release-3.23' 2022-03-31 08:48:19 -04:00
Brad King 025b86cc17 Merge topic 'help-json-length-empty-index' 
2f0a3d43e1 Help: Fix string(JSON ... LENGTH ...) signature

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7126
 2022-03-31 08:48:18 -04:00
Brad King 816151c118 Merge topic 'help-json-length-empty-index' into release-3.23 
2f0a3d43e1 Help: Fix string(JSON ... LENGTH ...) signature

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7126
 2022-03-31 08:48:17 -04:00
Brad King 27a1002ee8 Merge branch 'release-3.23' 2022-03-31 08:47:25 -04:00
Brad King 8ef1fffa45 Merge topic 'ninja_compile_database_understand_new_cuda_lang_variables' 
f7c6b9833c CUDA: Ninja generator generates valid compile database

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7129
 2022-03-31 08:47:25 -04:00
Brad King e5cda4c772 Merge topic 'ninja_compile_database_understand_new_cuda_lang_variables' into release-3.23 
f7c6b9833c CUDA: Ninja generator generates valid compile database

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7129
 2022-03-31 08:47:24 -04:00
Brad King f9215a42ba Merge branch 'release-3.23' 2022-03-31 08:46:29 -04:00
Brad King 2657454b59 Merge topic 'CMakeDependentOption-doc-improvement' 
7a614977f9 CMakeDependentOption: improve documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Rui Oliveira <ruimail24@gmail.com>
Merge-request: !7124
 2022-03-31 08:46:29 -04:00
Brad King cc75519e5d Merge topic 'CMakeDependentOption-doc-improvement' into release-3.23 
7a614977f9 CMakeDependentOption: improve documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Rui Oliveira <ruimail24@gmail.com>
Merge-request: !7124
 2022-03-31 08:46:28 -04:00
Kitware Robot 6f132d6c91 CMake Nightly Date Stamp 2022-03-31 00:01:20 -04:00
Ben Boeckel 7a614977f9 CMakeDependentOption: improve documentation 
This makes it far clearer that `<depends>` is a list up front instead of
burying the lede because a list is generally "trivially true" in CMake[1].
Also clarify that `<force>` is only available as a local variable and if
queried outside of the "scope" of the `cmake_dependent_option` call,
will get the stored user cache value.

[1] The exception being when the last entry ends in `-NOTFOUND`.

Suggested-by: Rui Oliveira
 2022-03-30 16:05:37 -04:00
nega 99f7d1973c FindGSL: Quiet pkg-config errors 
Issue: #23314
 2022-03-30 16:01:59 -04:00
nega 655582e931 FindLAPACK: Quiet pkg-config errors 
Issue: #23314
 2022-03-30 16:01:56 -04:00
nega 6dab35e25d FindBLAS: Quiet pkg-config errors 
Issue: #23314
 2022-03-30 16:01:49 -04:00
nega b2a7f73b55 FindGLUT: Quiet pkg-config errors 
Issue: #23314
 2022-03-30 15:59:31 -04:00
Carlo Teubner 93dce4b4bf string(JSON): fix error message on invalid mode 
The `GET_ARRAY` and `MEMBERS` modes were removed during development and
review of commit 8eab76eb84 (string(JSON): Adds JSON parsing support to
the string command, 2020-08-24, v3.19.0-rc1~159^2), but were
accidentally left in an error message.
 2022-03-30 15:54:11 -04:00
Robert Maynard f7c6b9833c CUDA: Ninja generator generates valid compile database 
The ninja generator has been updated to poperly write the compile
database when the CUDA language has been enabled.

Fixes #23368
 2022-03-30 15:16:43 -04:00
Brad King 624ec3692f GNUInstallDirs: Revert "Apply Debian multiarch LIBDIR to more prefixes" 
Revert commit dd9584b352 (GNUInstallDirs: Apply Debian multiarch LIBDIR
to more prefixes, 2021-11-19, v3.23.0-rc1~323^2).  There are separate
problems with activating multiarch `LIBDIR` for each prefix it added:

* Prefix `/` is often used to stage an installation with `DESTDIR`
  for inclusion in a tarball package or similar.

* Prefix `/usr/local` is the default `CMAKE_INSTALL_PREFIX`, causing
  the multiarch `LIBDIR` to be cached after the first configuration,
  even if the prefix changes later.

Revert the change for now, except for the documentation update.
Further discussion will be needed to select a way to enable
multiarch `LIBDIR` for `/` and `/usr/local`.

Fixes: #23365
Issue: #19698
 2022-03-30 11:51:01 -04:00
Tobias Nießen cf4100d7da Help: Add that CMAKE_CACHEFILE_DIR might not be defined 
CMake only sets `CMAKE_CACHEFILE_DIR` when writing `CMakeCache.txt`,
so the variable will usually be undefined when `CMakeLists.txt` runs.
Revise its documentation to clarify that `CMAKE_BINARY_DIR` should
be used instead.
 2022-03-30 09:20:18 -04:00
Tobias Nießen 2f0a3d43e1 Help: Fix string(JSON ... LENGTH ...) signature 
The list of indices and/or member names is optional, i.e., can be
empty. For example, string(JSON foo LENGTH "[0,0,0]") sets foo to 3.
 2022-03-30 09:14:13 -04:00
Brad King a7b325e203 Merge topic 'verify-header-sets' 
c798744f81 FILE_SET: Add VERIFY_HEADER_SETS target property

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !7085
 2022-03-30 09:10:25 -04:00
Brad King 1e23384580 Merge topic 'FindHDF5-library' 
e4e309f165 FindHDF5: Add explicit library location instead of guessed library name.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !7105
 2022-03-30 09:04:26 -04:00
Brad King 3d11097ccf Merge topic 'preserve-compiler-arg1' 
211a9deac1 Preserve CMAKE_${lang}_COMPILER_ARG1 from existing CMakeCache.txt
b4de4217ae Tests: Simplify RunCMake.CompilerArgs no-clean cases

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7122
 2022-03-30 09:03:16 -04:00
Brad King 70ee9a313a Merge topic 'framework-consumption-during-compilation' 
45ac71d8bc Ensure targets which are frameworks can be used freely

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: alcroito <alexandru.croitor@qt.io>
Merge-request: !7121
 2022-03-30 09:02:15 -04:00
Kitware Robot c65bcea078 CMake Nightly Date Stamp 2022-03-30 00:01:17 -04:00
Kyle Edwards c798744f81 FILE_SET: Add VERIFY_HEADER_SETS target property 
Fixes: #23338
 2022-03-29 13:58:27 -04:00