mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-03 20:29:56 -06:00
Code Issues Packages Projects Releases Wiki Activity
59,226 Commits 2 Branches 385 Tags
c23ebfa333208df8730a2c84635faf11fc7ad669
Commit Graph

6376 Commits

Author SHA1 Message Date
Brad King
1394e8e7c1 Merge branch 'release-3.23' 2022-10-04 14:23:17 -04:00
Brad King
34a6da34b8 CMake 3.23.4 2022-10-04 13:26:33 -04:00
Brad King
5e53164acf Merge topic 'improve-try_compile-debug-documentation' 
3801785cc3 Help: Improve try_compile debug documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: alcroito <alexandru.croitor@qt.io>
Merge-request: !7735
 2022-10-04 10:28:32 -04:00
Brad King
6755539fca Merge topic 'fix-try_compile-doc-typo' 
ef05a56387 Help: Fix typo in try_compile documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7736
 2022-10-04 10:27:40 -04:00
Matthew Woehlke
3801785cc3 Help: Improve try_compile debug documentation 
Update the --debug-trycompile documentation to account for recent
changes to try_compile. Mention where in the build tree to find
artifacts when using said option.
 2022-10-03 11:44:58 -04:00
Matthew Woehlke
ef05a56387 Help: Fix typo in try_compile documentation 2022-09-30 15:49:35 -04:00
Matthew Woehlke
0f28653ba9 try_compile: Rename SOURCE_FROM_ARG -> SOURCE_FROM_CONTENT 
Change the SOURCE_FROM_ARG keyword to try_compile to SOURCE_FROM_CONTENT
(which we can do because it was recently added and hasn't been in a
release yet). The new name should be clearer as to what it does, and
also more consistent with the CONTENT arguments to some other commands.

Also, fix a typo in an error message.
 2022-09-30 14:50:25 -04:00
Brad King
cadcb6a5f0 Merge topic 'try_compile-no-cache' 
09b3051524 try_compile: Add NO_CACHE option (also try_run)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7723
 2022-09-29 07:59:02 -04:00
Brad King
beb4f5df47 Merge topic 'tutorial_step4_update' 
37fceb6fd3 Tutorial: Update step 4 style

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7646
 2022-09-29 07:54:05 -04:00
Matthew Woehlke
09b3051524 try_compile: Add NO_CACHE option (also try_run) 
Add NO_CACHE option to try_compile and try_run, which places the results
in regular, rather than cache, variables.

Issue: #22799
 2022-09-28 13:41:11 -04:00
Markus Ferrell
37fceb6fd3 Tutorial: Update step 4 style 2022-09-28 11:38:28 -04:00
Brad King
43a0206dad Merge topic 'vs11-deprecate' 
6c1337cb79 Deprecate Visual Studio 11 2012 generator
5faf145a5b Tests: Drop unused files from RunCMake.CommandLine

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7720
 2022-09-28 10:40:32 -04:00
Brad King
b9968f3006 Merge topic 'cmake-presets-workflow' 
374d82bbcd cmake: Add --workflow mode
e316812884 CMakePresets.json: Add workflow presets to schema

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7711
 2022-09-28 10:38:41 -04:00
Brad King
6c1337cb79 Deprecate Visual Studio 11 2012 generator 
Update documentation to mark the generator deprecated.  Add a warning at
the end of generation plus an option to turn off the warning.
 2022-09-27 11:45:50 -04:00
Kyle Edwards
374d82bbcd cmake: Add --workflow mode 
Fixes: #23118
 2022-09-27 11:09:06 -04:00
Brad King
164a156c7c Merge topic 'remove-vs10-generator' 
8d6f015d59 Drop Visual Studio 10 2010 generator

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7718
 2022-09-27 10:32:11 -04:00
Brad King
50b668ddc8 Merge topic 'add_subdirectory_system' 
2eb30a7036 add_subdirectory: Add SYSTEM option

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7399
 2022-09-27 10:28:49 -04:00
Brad King
954b861dba Merge topic 'cpack-nsis-arguments-command-line' 
d1613ac880 CPack/NSIS: Add options to set makensis arguments

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7715
 2022-09-27 10:26:12 -04:00
Brad King
8d6f015d59 Drop Visual Studio 10 2010 generator 
This generator has been deprecated since CMake 3.22.  Remove it.
 2022-09-26 15:43:04 -04:00
Johnny Jazeix
d1613ac880 CPack/NSIS: Add options to set makensis arguments 
Fixes: #23446
 2022-09-26 17:58:12 +02:00
Da Quexian
2eb30a7036 add_subdirectory: Add SYSTEM option 
Fixes: #22401
Signed-off-by: Da Quexian <daquexian566@gmail.com>
 2022-09-26 10:56:54 -04:00
Brad King
eb6e2ef7f6 Merge topic 'doc-typo-fix' 
e34f543678 Help/CPACK_START_MENU_SHORTCUTS: fix monospace markup

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7714
 2022-09-26 09:39:44 -04:00
Brad King
d497b06ee9 Merge topic 'cmake-presets-package-more-doc-fixes' 
33b1338a92 Tests: Add test for --list-presets=all
4328deb618 Tests: Add test for cpack --list-presets
e909384062 Help: Add package preset to example presets file
16a24b0ab0 Help: List packagePresets field in cmake-presets.7

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !7707
 2022-09-26 09:38:54 -04:00
Ben Boeckel
e34f543678 Help/CPACK_START_MENU_SHORTCUTS: fix monospace markup 2022-09-23 15:50:51 -04:00
Brad King
98aef0929f Merge topic 'try_compile-source-from' 
611d801790 try_compile: Add SOURCE_FROM_FILE
a04eaf6742 Tests: Clean up and simplify TryCompile tests
cb14ae2b87 try_compile: Add SOURCE_FROM_{ARG,VAR}

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7700
 2022-09-23 08:52:13 -04:00
Kyle Edwards
e909384062 Help: Add package preset to example presets file 2022-09-22 16:24:38 -04:00
Kyle Edwards
16a24b0ab0 Help: List packagePresets field in cmake-presets.7 2022-09-22 16:14:01 -04:00
Matthew Woehlke
611d801790 try_compile: Add SOURCE_FROM_FILE 
Add ability to copy try_compile (and try_run) source files from
arbitrary locations into the operation directory. This is included for
the sake of completion and consolidation, although use cases which
actually require this may be rare.
 2022-09-22 14:56:50 -04:00
Matthew Woehlke
cb14ae2b87 try_compile: Add SOURCE_FROM_{ARG,VAR} 
Add ability to "feed" try_compile (and try_run) sources more directly,
either from literal content, or from a CMake variable which contains
literal content. This saves the user from needing a separate step to
write the content to a file, and allows for the sources to only exist in
the scratch directory.
 2022-09-22 13:33:27 -04:00
Marc Chevrier
0bd3efffbc Genex LINK_LIBRARY: Add support for framework with postfix 2022-09-21 16:14:36 +02:00
Brad King
fc17277bda Merge topic 'detect-lib_foo.a-msvc' 
be848a71b0 MSVC: Teach find_library to consider the 'libfoo.a' naming convention

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7694
 2022-09-20 09:12:57 -04:00
Hinell
37381506dc Help: Link from add_custom_target to policy on BYPRODUCTS 
Link policy explaining BYPRODUCTS.

Apply the change from commit 00b788e85e (Help:custom_command: link
policy on BYPRODUCTS, 2022-09-09) to `add_custom_target` docs too.

Issue: #23786
 2022-09-19 12:39:29 -04:00
Yonggang Luo
be848a71b0 MSVC: Teach find_library to consider the 'libfoo.a' naming convention 
When targeting the GNU ABI, we consider `.a` libraries first but also
accept `.lib`.  For symmetry, when targeting the MSVC ABI, we now
consider `.lib` first but also accept `.a`.

This adds support for meson-generated static libraries, which are named
with the pattern `lib${foo}.a`:

* https://mesonbuild.com/FAQ.html#why-does-building-my-project-with-msvc-output-static-libraries-called-libfooa

Fixes: #23975
Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
 2022-09-19 11:02:44 -04:00
Brad King
71cfcbe816 Merge topic 'transitive-usage-reqs-lnks' 
3d31f99b74 Help: Link from usage requirement commands to detailed explanation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7653
 2022-09-19 10:24:15 -04:00
Brad King
e9d9cd348c Merge topic 'help-add-custom-comman-byproducts' 
00b788e85e Help:custom_command: link policy on BYPRODUCTS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7662
 2022-09-19 10:23:02 -04:00
Brad King
f485e2c65b Merge topic 'env-tls-certs' 
10bf34a2d9 cmCurl: Honor OpenSSL certificate environment variables

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7670
 2022-09-19 10:21:22 -04:00
Hinell
3d31f99b74 Help: Link from usage requirement commands to detailed explanation 
Augment vague mentions of "Transitive Usage Requirements" with links to
a detailed explanation.

Fixes: #23799
 2022-09-16 10:54:27 -04:00
Hinell
00b788e85e Help:custom_command: link policy on BYPRODUCTS 
Link policy explaining BYPRODUCTS.

Fixes: #23786
 2022-09-16 10:50:46 -04:00
Brad King
3436858697 Merge topic 'try_compile-new-project-signature' 
56ae40cc59 try_compile: Add PROJECT keyword-dispatched signature

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !7677
 2022-09-16 10:26:27 -04:00
Brad King
ed8e860998 Merge topic 'xcode-lib-dirs' 
d4cc39842e Xcode: Do not append per-config suffixes to library search paths

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7672
 2022-09-16 10:25:14 -04:00
Maxim Cournoyer
10bf34a2d9 cmCurl: Honor OpenSSL certificate environment variables 
Honor the OpenSSL environment variables used to specify the location of
the TLS certificates, as specified in the `curl(1)` man page.

Co-authored-by: Ludovic Courtès <ludo@gnu.org>
 2022-09-16 09:40:28 -04:00
Mikko Sivulainen
d4cc39842e Xcode: Do not append per-config suffixes to library search paths 
Add policy `CMP0142` to remove the automatic addition of the
`$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)` suffix in a compatible way.

Fixes: #21757
 2022-09-15 10:27:23 -04:00
Brad King
01a25d72c6 Merge topic 'add_tasking_compiler' 
94df5b6ef1 Tasking: Add support for several compiler toolsets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7491
 2022-09-15 09:19:58 -04:00
Matthew Woehlke
56ae40cc59 try_compile: Add PROJECT keyword-dispatched signature 
Introduce a new signature for the project flavor of try_compile (and
try_run) which removes the `bindir` argument and adds a required PROJECT
tag. This is similar to the SOURCES flavor added by commit aa9220d3
(try_compile: Add keyword-dispatched signature, 2022-09-02).
 2022-09-14 16:35:50 -04:00
Christoph Seitz
94df5b6ef1 Tasking: Add support for several compiler toolsets 
Add support for the Tasking compiler toolset:

* TriCore Compiler Toolset 6.3 (with TriCore, ARM, MCS,
  8051 and PCP architecture compilers)
* SmartCode Compiler Toolset 10.1 (with TriCore, ARC, MCS,
  8051 architecture compilers)
* ARM Compiler 6.0
* MCS Complier 3.3
* 8051 Compiler 7.2

Fixes: #23756
 2022-09-14 09:58:50 -04:00
Brad King
c3e68020d6 Merge topic 'MsvcDebugInformationFormatAbstraction' 
a858466aac MSVC: Add test for debug information format
0e96a20478 MSVC: Add abstraction for debug information format
d4c8111da4 Clang/Windows: Clarify name of internal runtime library flags variables

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7606
 2022-09-14 09:21:27 -04:00
Glen Chung
0e96a20478 MSVC: Add abstraction for debug information format 
Replace our hard-coded default for `/Zi` with a first-class abstraction
to select the debug information format an enumeration of logical
names.  We've long hesitated to do this because the idea of "debug
information format" touches on related concepts on several platforms.
Avoid that scope creep by simply defining an abstraction that applies
only when targeting the MSVC ABI on Windows.

Removing the old default flag requires a policy because existing
projects may rely on string processing to edit them and choose a
runtime library under the old behavior.  Add policy CMP0141 to
provide compatibility.

Fixes: #10189
 2022-09-14 09:12:47 -04:00
Brad King
355b12af79 Merge branch 'release-3.24' 2022-09-13 10:39:01 -04:00
Brad King
31f835410e CMake 3.24.2 2022-09-13 09:53:22 -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