mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-03-01 04:08:46 -06:00
Code Issues Packages Projects Releases Wiki Activity
49,539 Commits 2 Branches 391 Tags
7d0fa4a943f90567979b5d43c2249cc58ccca5d7
Commit Graph

49539 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King
7d0fa4a943 Merge branch 'upstream-curl' into update-curl 
* upstream-curl:
  curl 2020-08-19 (9d954e49)
 2020-08-19 12:50:05 -04:00
Curl Upstream
7ceb56989f curl 2020-08-19 (9d954e49) 
Code extracted from:

    https://github.com/curl/curl.git

at commit 9d954e49bce3706a9a2efb119ecd05767f0f2a9e (curl-7_72_0).
 2020-08-19 12:44:30 -04:00
Brad King
c156948327 curl: Update script to get curl 7.72.0 2020-08-19 12:44:12 -04:00
Brad King
162583bb19 Merge topic 'CMakeDetermineCXXCompiler-clang-typo' 
10d7445dd8 clang: Fix the typo for CMAKE_CXX_COMPILER_ID_TEST_FLAGS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5140
 2020-08-19 11:51:03 -04:00
Brad King
80b9c4411b Merge topic 'ccmake-no-form-warnings' 
16accdc76e ccmake: suppress warnings in third-party form code

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5141
 2020-08-19 11:49:18 -04:00
Brad King
cb5c8e6f25 Merge topic 'cpack-wix-custom-xmlns' 
267de3ba30 CPack/WiX: Add support for custom XML namespaces

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5132
 2020-08-19 11:48:24 -04:00
Brad King
fed08ce4cf Merge topic 'ExternalProject-retry-only-recoverable' 
116b06870d ExternalProject: add INACTIVITY_TIMEOUT argument
f24e34975a ExternalProject: retry download on recoverable errors

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5034
 2020-08-19 11:47:34 -04:00
Brad King
f1ec88708d Merge topic 'CMakeDependentOption-doc' 
91f791b498 CMakeDependentOption: Expand documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5138
 2020-08-19 11:46:29 -04:00
Brad King
5d77051a43 Merge topic 'buildsystem_documentation_update' 
cfcb71c530 Help: Update cmake-buildsystem documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5123
 2020-08-19 11:45:38 -04:00
Brad King
28ae9d8d59 Merge branch 'release-3.18' 2020-08-19 11:40:03 -04:00
Brad King
db160604f7 Merge topic 'ep-patch-skip-update-dep' 
715324742f ExternalProject: Stop configure target from always appearing out-of-date
c0b7198ad9 ExternalProject: Stop patch target from always appearing out-of-date

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5136
 2020-08-19 11:40:03 -04:00
Brad King
281a87f834 Merge topic 'ep-patch-skip-update-dep' into release-3.18 
715324742f ExternalProject: Stop configure target from always appearing out-of-date
c0b7198ad9 ExternalProject: Stop patch target from always appearing out-of-date

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5136
 2020-08-19 11:40:02 -04:00
Brad King
296e2aa818 Merge branch 'release-3.18' 2020-08-19 11:37:55 -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
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
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
b55965e137 Merge branch 'release-3.18' 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
Thomas Bernard
10d7445dd8 clang: Fix the typo for CMAKE_CXX_COMPILER_ID_TEST_FLAGS 
Fix typo from commit 270e0d9c4d (Detect the correct target architecture
for clang compilers., 2020-07-28).

Issue: #21097
 2020-08-18 17:23:54 -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
Brad King
16accdc76e ccmake: suppress warnings in third-party form code 2020-08-18 17:09:23 -04:00
Betsy McPhail
91f791b498 CMakeDependentOption: Expand documentation 2020-08-18 13:33:06 -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
Craig Scott
715324742f ExternalProject: Stop configure target from always appearing out-of-date 
When updates are disconnected, don't depend on skip-update because that
target is always considered out of date. Depend directly on the patch target
instead because it already depends on the appropriate target regardless of
whether updates are disconnected or not. This in turn means nothing depends
on the skip-update target, so it has also been removed.

Relates: #21086
 2020-08-18 23:27:47 +10:00
Craig Scott
c0b7198ad9 ExternalProject: Stop patch target from always appearing out-of-date 
The skip-update target is always considered out-of-date. The change in
7249ba9677 (ExternalProject: Enforce that patch depends on update, 2020-04-03)
made the patch target depend on skip-update, which in turn made it
always out of date too. The patch command should only be re-run if the download
needs to be performed again where updates are disconnected.

Fixes: #21086
 2020-08-18 23:21:36 +10:00
Thomas Bernard
116b06870d ExternalProject: add INACTIVITY_TIMEOUT argument 
In order to abort transfers on slow connections the ExternalProject
command support passing the INACTIVITY_TIMEOUT argument.

Fixes: #20992
 2020-08-18 09:16:18 -04:00
Fritz Elfert
267de3ba30 CPack/WiX: Add support for custom XML namespaces 
Add a `CPACK_WIX_CUSTOM_XMLNS` option to specify these.

Fixes: #21098
 2020-08-18 07:50:49 -04:00
Joseph Snyder
cfcb71c530 Help: Update cmake-buildsystem documentation 
Add additional information to the cmake-buildsystem manual:

* Add link to "Generator Expressions" in a place which demonstrates a
  generator expression without linking to what they are.
* Update "diagnostic message" for "Compatible Interface Properties" to
  contain an example of the message sent.
* Add information about the macOS FRAMEWORK_VERSION and how "A" is the
  conventional value to use.
 2020-08-18 07:42:42 -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