mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-03-01 12:18:36 -06:00
Code Issues Packages Projects Releases Wiki Activity
49,518 Commits 2 Branches 391 Tags
296e2aa8184767c8334ef55c79f2e04fe304c331
Commit Graph

49518 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King
296e2aa818 Merge branch 'release-3.18' 2020-08-19 11:37:55 -04:00
Brad King
b5198dacdd Merge topic 'llvm-rc-quote-cmake' 
447dfddb20 Merge branch 'backport-3.18-llvm-rc-quote-cmake' into llvm-rc-quote-cmake
3937536d16 llvm-rc: Fix quoting of path to cmake in CMAKE_RC_COMPILE_OBJECT

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5139
 2020-08-19 11:37:54 -04:00
Brad King
833e84ca1c Merge topic 'llvm-rc-quote-cmake' into release-3.18 
3937536d16 llvm-rc: Fix quoting of path to cmake in CMAKE_RC_COMPILE_OBJECT

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5139
 2020-08-19 11:37:54 -04:00
Brad King
b55965e137 Merge branch 'release-3.18' 2020-08-19 11:36:51 -04:00
Brad King
e9d0059bb3 Merge topic 'FindPython-enhance-version-extraction-from-lib-name' into release-3.18 
72822e26c9 FindPython: enhance robustness of version extraction from library name

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5135
 2020-08-19 11:36:51 -04:00
Brad King
705a60902d Merge topic 'FindPython-enhance-version-extraction-from-lib-name' 
72822e26c9 FindPython: enhance robustness of version extraction from library name

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5135
 2020-08-19 11:36:51 -04:00
Brad King
612a5437e0 Merge branch 'release-3.18' 2020-08-19 11:35:25 -04:00
Brad King
09e8de75d5 Merge topic 'CMakeFindBinUtils-fallback' into release-3.18 
6896e50967 CMakeFindBinUtils: Always consider plain binutils when not cross-compiling

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5137
 2020-08-19 11:35:00 -04:00
Brad King
e3f9056aad Merge topic 'CMakeFindBinUtils-fallback' 
6896e50967 CMakeFindBinUtils: Always consider plain binutils when not cross-compiling

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5137
 2020-08-19 11:32:51 -04:00
Kitware Robot
92d7249031 CMake Nightly Date Stamp 2020-08-19 00:01:29 -04:00
Brad King
447dfddb20 Merge branch 'backport-3.18-llvm-rc-quote-cmake' into llvm-rc-quote-cmake 2020-08-18 17:18:38 -04:00
Thomas Bernard
3937536d16 llvm-rc: Fix quoting of path to cmake in CMAKE_RC_COMPILE_OBJECT 
When the installation path to cmake includes spaces, the
`<CMAKE_COMMAND>` is required to have proper quotation of the cmake
call.

Fixes: #21095
 2020-08-18 17:15:34 -04:00
Robert Maynard
6896e50967 CMakeFindBinUtils: Always consider plain binutils when not cross-compiling 
Since commit c5dd2ca538 (DetermineCompiler: Relax
_CMAKE_TOOLCHAIN_PREFIX detection, 2020-03-25, v3.18.0-rc1~430^2),
`_CMAKE_TOOLCHAIN_PREFIX` may be set even when not cross-compiling.
In this case we may still need to use binutils without any prefix.

Fixes: #21103
 2020-08-18 13:19:24 -04:00
Brad King
31b057182e Merge topic 'FixGraphvizAliasTargets' 
f7dd74e4ef Graphviz: Fix bug that shows duplicated alias targets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5134
 2020-08-18 10:29:06 -04:00
Brad King
2f5cb922f3 Merge topic 'fotran_module_vs_docs' 
c5407b95f0 Help: Expand Fortran_MODULE_DIRECTORY documentation.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5128
 2020-08-18 10:28:22 -04:00
Brad King
44fac4a34e Merge topic 'findhdf5-targets' 
5eff274017 FindHDF5: Remove VTK library type detection
a8e0a6b3e4 FindHDF5: Port changes from VTK

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !5129
 2020-08-18 10:27:29 -04:00
Marc Chevrier
72822e26c9 FindPython: enhance robustness of version extraction from library name 
Fixes: #21105
 2020-08-18 12:30:47 +02:00
Kitware Robot
f6290f024c CMake Nightly Date Stamp 2020-08-18 00:01:22 -04:00
Stephan Rohmen
f7dd74e4ef Graphviz: Fix bug that shows duplicated alias targets 
When using subdirectories the alias targets were duplicated
 2020-08-17 21:48:47 +02:00
Petr Kmoch
c5407b95f0 Help: Expand Fortran_MODULE_DIRECTORY documentation. 
Document how Visual Studio generators append per-configuration directory
to path where Fortran modules are created.
 2020-08-17 15:27:52 -04:00
Brad King
fe3a404a73 Merge topic 'add_test-special-chars-in-name' 
a20987732b add_test: Allow special characters in test name (w/ policy CMP0110)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5076
 2020-08-17 14:58:49 -04:00
Brad King
c873bb0a14 Merge topic 'FindX11-xcb-util-xfixes' 
6d231b494f FindX11: Add xcb_util and xcb_xfixes libraries

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5116
 2020-08-17 14:54:22 -04:00
Brad King
386bec2d9d Merge topic 'xcode12-link-matching-zlib' 
862dbe1367 Xcode: Link matching zlib for iOS Simulator SDK

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5125
 2020-08-17 14:52:51 -04:00
Brad King
3313bf06eb Merge topic 'ios-combined-prune-archs' 
5852b8867f CMakeIOSInstallCombined: Enforce disjoint architecture sets
79098d23eb Tests: Avoid warnings about unused arguments

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5111
 2020-08-17 14:52:08 -04:00
Kitware Robot
35d8543f25 CMake Nightly Date Stamp 2020-08-17 00:01:09 -04:00
Kitware Robot
39cdfa9681 CMake Nightly Date Stamp 2020-08-16 00:01:09 -04:00
Kitware Robot
de19c0c9ca CMake Nightly Date Stamp 2020-08-15 00:01:13 -04:00
Seth R Johnson
5eff274017 FindHDF5: Remove VTK library type detection 2020-08-14 12:03:21 -04:00
Ben Boeckel
a8e0a6b3e4 FindHDF5: Port changes from VTK 2020-08-14 11:57:59 -04:00
Kyle Edwards
7278ab262e Merge topic 'FindOpenSSL-static' 
1925f9d8eb FindOpenSSL: Add support for finding static libraries

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5124
 2020-08-14 10:09:10 -04:00
Craig Scott
512e744d2a Merge topic 'help-formatting' 
5b17421bdc Help: Improve formatting for IMPLICIT_DEPENDS_INCLUDE_TRANSFORM

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5126
 2020-08-14 06:46:39 -04:00
Kitware Robot
c90690a2d8 CMake Nightly Date Stamp 2020-08-14 00:01:12 -04:00
Josef Angstenberger
5b17421bdc Help: Improve formatting for IMPLICIT_DEPENDS_INCLUDE_TRANSFORM 2020-08-14 01:51:59 +02:00
Kyle Edwards
8b5aa9051b Merge topic 'optimize-static-library-deps' 
2e42651dff Add option to optimize link dependencies for static libraries

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5103
 2020-08-13 14:16:25 -04:00
Gregor Jasny
862dbe1367 Xcode: Link matching zlib for iOS Simulator SDK 
The XcodeRemoveExcessiveISystem test runs
`find_package(ZLIB)` which returns an SDK-relative
path to `zlib.tlb`. When the test switches the SDK
for building to something different than the SDK used
for configuration the linker rightfully complains about
the mismatch.

The fix is to configure and build with the same SDK.
 2020-08-13 18:05:34 +02:00
Sylvain Corlay
1925f9d8eb FindOpenSSL: Add support for finding static libraries 
Fixes: #20903
 2020-08-13 17:59:13 +02:00
Kitware Robot
5748e76639 CMake Nightly Date Stamp 2020-08-13 00:01:11 -04:00
Brad King
11d65493c1 Merge branch 'release-3.18' 2020-08-12 12:22:46 -04:00
Brad King
e3fcb49d93 Merge topic 'FindRuby_document_deprecated_variables' 
e7fe0b24c4 FindRuby: Add documentation for deprecated variables

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5120
 2020-08-12 12:22:46 -04:00
Brad King
acd15bf146 Merge topic 'FindRuby_document_deprecated_variables' into release-3.18 
e7fe0b24c4 FindRuby: Add documentation for deprecated variables

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5120
 2020-08-12 12:22:45 -04:00
Kyle Edwards
2e42651dff Add option to optimize link dependencies for static libraries 
Add an `OPTIMIZE_DEPENDENCIES` target property and supporting
`CMAKE_OPTIMIZE_DEPENDENCIES` variable to optionally enable pruning and
flattening of outgoing dependencies from static libraries.  Since they
do not actually link, they only depend on side effects of their
dependencies.  Therefore we can drop dependencies that contribute no
side effects.
 2020-08-12 11:31:07 -04:00
Daniele E. Domenichelli
e7fe0b24c4 FindRuby: Add documentation for deprecated variables 
Since commit e672db628b (FindRuby: Rename variables to match case of
module name, 2020-03-11, v3.18.0-rc1~546^2), the upper-case-prefixed
variable names are for compatibility only but still exist.  Put them
back in the documentation.

Issue: #21064
 2020-08-12 11:25:45 -04:00
Brad King
5a5d1a8933 Merge branch 'release-3.18' 2020-08-12 11:14:52 -04:00
Brad King
b3196fe864 Merge topic 'msvc_c11' 
f7347f28c7 MSVC: Record support for C11 and c_restrict

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5115
 2020-08-12 11:14:52 -04:00
Brad King
eaf81817c4 Merge topic 'msvc_c11' into release-3.18 
f7347f28c7 MSVC: Record support for C11 and c_restrict

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5115
 2020-08-12 11:14:51 -04:00
Brad King
9ae9acaab2 Merge branch 'release-3.18' 2020-08-12 11:13:16 -04:00
Brad King
0ca6d5766b Merge topic 'FindPython-manage-SOABI-in-all-versions' into release-3.18 
951640f1f9 FindPython: manage SOABI for all Python versions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5119
 2020-08-12 11:13:16 -04:00
Brad King
0603eb00f9 Merge topic 'FindPython-manage-SOABI-in-all-versions' 
951640f1f9 FindPython: manage SOABI for all Python versions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5119
 2020-08-12 11:13:16 -04:00
Deniz Bahadir
a20987732b add_test: Allow special characters in test name (w/ policy CMP0110) 
Restore the change from commit f84af8e270 (add_test: Allow special
characters in test name, 2020-05-16, v3.18.0-rc1~142^2) that had to be
reverted by commit f84af8e270 (add_test: Allow special characters in
test name, 2020-05-16, v3.18.0-rc1~142^2) for compatibility.

Add policy CMP0110 to make the change in a compatible way.
Also, support even more characters than before by generating the
test scripts using bracket arguments around the test names.

Fixes: #19391
Signed-off-by: Deniz Bahadir <dbahadir@benocs.com>
 2020-08-12 10:44:07 -04:00
Tim Blechmann
6d231b494f FindX11: Add xcb_util and xcb_xfixes libraries 2020-08-12 14:01:01 +08:00