mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-21 13:48:33 -05:00
Code Issues Packages Projects Releases Wiki Activity
51,518 Commits 2 Branches 401 Tags
fddbb7db4b41f617489dc068c5ce25218ef8ac90
Commit Graph

51518 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King fddbb7db4b Merge topic 'vs-sdk-selection' 
1e67482daf VS: Generalize Win10 max SDK version to all VS generators

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5721
 2021-01-21 09:18:31 -05:00
Brad King c70f49d16e Merge branch 'release-3.19' 2021-01-21 09:17:39 -05:00
Brad King 89430f4604 Merge topic 'FindHDF5-silence-output' 
b924669385 FindHDF5: silence STATUS messages when found with QUIET
2439a048b0 FindHDF5: avoid writing to the output when testing h5cc

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5722
 2021-01-21 09:17:39 -05:00
Brad King 7838a065a6 Merge topic 'FindHDF5-silence-output' into release-3.19 
b924669385 FindHDF5: silence STATUS messages when found with QUIET
2439a048b0 FindHDF5: avoid writing to the output when testing h5cc

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5722
 2021-01-21 09:17:39 -05:00
Brad King 7411c850a8 Merge branch 'release-3.19' 2021-01-21 09:16:37 -05:00
Brad King 15fe8cf8a5 Merge topic 'macos-include-weak-dependencies' into release-3.19 
7e615a540e file(GET_RUNTIME_DEPENDENCIES): Fix weak macOS libraries not detected
f2d92b983b GetPrerequisites: Include weak macOS dependencies

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5703
 2021-01-21 09:16:37 -05:00
Brad King 6bf23b2755 Merge topic 'macos-include-weak-dependencies' 
7e615a540e file(GET_RUNTIME_DEPENDENCIES): Fix weak macOS libraries not detected
f2d92b983b GetPrerequisites: Include weak macOS dependencies

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5703
 2021-01-21 09:16:37 -05:00
Kitware Robot d1549824c9 CMake Nightly Date Stamp 2021-01-21 00:01:13 -05:00
jonathan molinatto 1e67482daf VS: Generalize Win10 max SDK version to all VS generators 
The `CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION_MAXIMUM` variable added in
CMake 3.19 by commit ba497111f6 (VS: Add option for custom Win10 SDK
version maximum, 2020-08-20, v3.19.0-rc1~262^2) was documented as if it
worked for all generators but implemented only to override CMake's
builtin default for the VS 2015 max SDK version.  Generalize the
variable to set a custom max SDK version for later VS versions too.

Fixes: #21720
 2021-01-20 14:46:34 -05:00
Ben Boeckel b924669385 FindHDF5: silence STATUS messages when found with QUIET 2021-01-20 14:05:14 -05:00
Ben Boeckel 2439a048b0 FindHDF5: avoid writing to the output when testing h5cc 
The execution of this tool can output error logs to the output during
configure. This can then be caught by CTest and flagged as an error
during the build.
 2021-01-20 14:04:25 -05:00
Brad King 063f7127d1 Merge topic 'ninja-custom_command-depfile' 
b5c2163293 Ninja: add_custom_command(DEPFILE): Ensure dependencies consistency

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5710
 2021-01-20 11:23:13 -05:00
Bianca van Schaik 7e615a540e file(GET_RUNTIME_DEPENDENCIES): Fix weak macOS libraries not detected 
Starting with Clang 12, `otool -l` reports `LC_LOAD_WEAK_DYLIB` instead
of `LC_LOAD_DYLIB` for weakly linked libraries.  Update the
implementation of `file(GET_RUNTIME_DEPENDENCIES)` to recognize these.

Fixes: #21684
 2021-01-20 10:26:54 -05:00
Bianca van Schaik f2d92b983b GetPrerequisites: Include weak macOS dependencies 
Starting with Clang 12, `otool -L` adds `, weak` to weakly linked
libraries.  Update GetPrerequisites to recognize these.

Issue: #21684
 2021-01-20 10:26:54 -05:00
Brad King 8809a742be Merge topic 'export-copy-if-different' 
51acae534a install(EXPORT): Set copy-if-different on install export config files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5717
 2021-01-20 10:22:32 -05:00
Brad King 4c6d433116 Merge topic 'doc-genex' 
c2dc7e0f53 Help: Convert genex documentation to sphinx domain objects
778321beb4 Help: Remove extra blank line from cmake-generator-expressions(7)
7d498d6b43 Utilities/Sphinx: Add role and directive for 'genex' in CMake domain
cc1f53351c Help/dev: Mention 'cpack_gen' domain object in CMake Documentation Guide
954a9e9893 Help/dev: Mention 'envvar' domain object in CMake Documentation Guide
621ba5e1f2 cmRST: Add support for 'envvar' directive

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5715
 2021-01-20 10:18:04 -05:00
Kitware Robot 4c28f27777 CMake Nightly Date Stamp 2021-01-20 00:01:12 -05:00
Daan De Meyer 51acae534a install(EXPORT): Set copy-if-different on install export config files 
Avoid reinstalling the per-config export install files if the
contents didn't change after a configure.
 2021-01-19 09:59:19 -05:00
Brad King fab301bb9d Merge topic 'bootstrap-compiler-check-ldflags' 
147ba659c1 bootstrap: add cmake_ld_flags to compilers check

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5711
 2021-01-19 09:07:57 -05:00
Brad King 85af079ab1 Merge branch 'release-3.19' 2021-01-19 09:06:53 -05:00
Brad King 180666f586 Merge topic 'CMake-cross-compiling' 
6cee4c6a8b Restore support for cross-compiling CMake itself

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5713
 2021-01-19 09:06:53 -05:00
Brad King 2c0e4c3762 Merge topic 'CMake-cross-compiling' into release-3.19 
6cee4c6a8b Restore support for cross-compiling CMake itself

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5713
 2021-01-19 09:06:52 -05:00
Marc Chevrier b5c2163293 Ninja: add_custom_command(DEPFILE): Ensure dependencies consistency 
Fixes: #21694
 2021-01-19 13:17:14 +01:00
Kitware Robot 2740cc458b CMake Nightly Date Stamp 2021-01-19 00:01:12 -05:00
Brad King c2dc7e0f53 Help: Convert genex documentation to sphinx domain objects 
This makes them linkable, indexed, and enables cross-references.
 2021-01-18 12:35:41 -05:00
Brad King 778321beb4 Help: Remove extra blank line from cmake-generator-expressions(7) 2021-01-18 12:35:41 -05:00
Brad King 7d498d6b43 Utilities/Sphinx: Add role and directive for 'genex' in CMake domain 
This enables cross-reference syntax for CMake generator expressions:

    :genex:`SOME_GENEX`
    :genex:`$<SOME_GENEX>`
    :genex:`$<SOME_GENEX:...>`

and definition of CMake generator expressions via a directive:

    .. genex:: SOME_GENEX
    .. genex:: $<SOME_GENEX>
    .. genex:: $<SOME_GENEX:...>

It also adds generator expressions defined by the directive and by
`Help/genex/SOME_GENEX.rst` documents to the index.
 2021-01-18 12:35:41 -05:00
Brad King cc1f53351c Help/dev: Mention 'cpack_gen' domain object in CMake Documentation Guide 
This was accidentally left out of commit 2a2829cc75 (Help: Add new
section for CPack generators, 2018-06-15, v3.13.0-rc1~394^2~3).
 2021-01-18 12:35:40 -05:00
Brad King 954a9e9893 Help/dev: Mention 'envvar' domain object in CMake Documentation Guide 
This was accidentally left out of commit 8acf46caf1 (Utilities/Sphinx:
Add role and directive for 'envvar' in CMake domain, 2018-04-19,
v3.12.0-rc1~200^2~1).
 2021-01-18 12:35:40 -05:00
Brad King 621ba5e1f2 cmRST: Add support for 'envvar' directive 
This was accidentally left out of commit 8acf46caf1 (Utilities/Sphinx:
Add role and directive for 'envvar' in CMake domain, 2018-04-19,
v3.12.0-rc1~200^2~1).
 2021-01-18 12:35:40 -05:00
Brad King 8a132eca8a Merge topic 'vim-ExternalProject-URL_MD5' 
c04b73f386 vim: Add missing keyword URL_MD5

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5714
 2021-01-18 12:35:07 -05:00
Marc Chevrier 6cee4c6a8b Restore support for cross-compiling CMake itself 
In commit eb583b0a66 (cmake_path command: path management, 2020-07-23,
v3.19.0-rc1~216^2~1) we added a `try_run`.  In cross-compilation mode,
C++ features tests must avoid running tests if there is no emulator
defined.
 2021-01-18 12:23:23 -05:00
Brad King 54dbc9c8f7 Merge topic 'ep-stash-options' 
ac4a8002a5 ExternalProject: Don't git stash ignored files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5390
 2021-01-18 11:20:45 -05:00
Brad King 2f047081fb Merge topic 'fileapi-toolchains' 
66b33c8cd4 Help: Add release note for fileapi "toolchains" object

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5707
 2021-01-18 11:19:16 -05:00
Brad King 80ea78da0d Merge topic 'cmake-gui-improvements' 
79d00c629f CMake GUI: Fix rendering issue
15e8072859 CMake GUI: Use system icons when available
8aebd159fc CMake GUI: Don't use QToolButton
0bc327a79c CMake GUI: Improve signal specification

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5706
 2021-01-18 11:18:37 -05:00
Brad King cbcb507227 Merge topic 'issue-17794' 
8f33674491 cpack(DEB): Issue warning if custom script for control file is missing

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5705
 2021-01-18 11:16:44 -05:00
Brad King 28523d63ff Merge topic 'FindPostgreSQL-server-component' 
8b066f1a65 FindPostgreSQL: Add server component

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !5680
 2021-01-18 11:16:04 -05:00
Brad King 21fc98ceec Merge topic 'test-remove-CMakeTestMultipleConfigures' 
c6845f9495 Tests: Remove outdated CMakeTestMultipleConfigures test

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5704
 2021-01-18 11:15:16 -05:00
Brad King 16ad286ead Merge topic 'irsl-msvcp_atomic_wait_dll' into release-3.19 
6718caaa2f IRSL: Install msvcp${v}${d}_atomic_wait.dll if available with CRT

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5702
 2021-01-18 11:14:22 -05:00
Brad King 1d0117299a Merge branch 'release-3.19' 2021-01-18 11:14:22 -05:00
Brad King 069e5a932d Merge topic 'irsl-msvcp_atomic_wait_dll' 
6718caaa2f IRSL: Install msvcp${v}${d}_atomic_wait.dll if available with CRT

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5702
 2021-01-18 11:14:22 -05:00
Marc Chevrier d9e66b814d Merge topic 'cmake_path_docs' 
c3ddb484d7 Help: Restructure and clarify cmake_path() docs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Shannon Booth <shannon.ml.booth@gmail.com>
Merge-request: !5682
 2021-01-18 09:05:41 -05:00
Kitware Robot fe3c4db2ea CMake Nightly Date Stamp 2021-01-18 00:01:16 -05:00
Eisuke Kawashima c04b73f386 vim: Add missing keyword URL_MD5 2021-01-17 23:46:56 +09:00
Kitware Robot 5b9f7a5f28 CMake Nightly Date Stamp 2021-01-17 00:01:07 -05:00
Issam E. Maghni 147ba659c1 bootstrap: add cmake_ld_flags to compilers check 2021-01-16 23:48:35 -05:00
Craig Scott c3ddb484d7 Help: Restructure and clarify cmake_path() docs 
Relates: #21385
 2021-01-16 23:58:09 +11:00
Craig Scott ac4a8002a5 ExternalProject: Don't git stash ignored files 
The change to the binary gitrepo.tgz file adds a commit which
adds a .gitignore file.

Fixes: #21278
 2021-01-16 18:12:00 +11:00
Kitware Robot 12a88d5d27 CMake Nightly Date Stamp 2021-01-16 00:01:11 -05:00
Brad King 66b33c8cd4 Help: Add release note for fileapi "toolchains" object 
This release note was accidentally left out of commit f72bb2ee0d (Help:
Add documentation for "toolchains" object kind, 2021-01-07).
 2021-01-15 13:29:09 -05:00