mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-02 03:39:43 -06:00
Code Issues Packages Projects Releases Wiki Activity
49,583 Commits 2 Branches 385 Tags
ea67dbc4cd3cf4d8c02ba4099b4e9600ef93b708
Commit Graph

10854 Commits

Author SHA1 Message Date
Brad King
4294526504 Merge topic 'msvc_static_assert' 
95bc11dbb4 MSVC: Record support for c_static_assert

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5148
 2020-08-25 10:26:54 -04:00
Craig Scott
b972e25276 FetchContent: Fix SOURCE_DIR, BUILD_DIR when disconnected or overridden 
Fixes: #21123
 2020-08-23 18:38:47 +10:00
Brad King
6cbaa8eb93 Merge topic 'clang-cl-restore-preprocess' 
7b083d59c2 clang-cl: Restore rules to create preprocessed and assembly output

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5142
 2020-08-21 09:31:08 -04:00
Raul Tambre
95bc11dbb4 MSVC: Record support for c_static_assert 
Supported since MSVC 19.28.29115 (VS 16.8.0 Preview 1.0).
 2020-08-20 09:45:47 -04:00
Brad King
4fc1dd2ff1 Merge topic 'FindMPI-cuda-pthread' into release-3.18 
47abe5f225 FindMPI: Fix regression in pthread guard

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Raul Tambre <raul@tambre.ee>
Merge-request: !5147
 2020-08-20 07:55:23 -04:00
Brad King
e029cb1ca6 Merge topic 'FindMPI-cuda-pthread' 
47abe5f225 FindMPI: Fix regression in pthread guard

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Raul Tambre <raul@tambre.ee>
Merge-request: !5147
 2020-08-20 07:55:23 -04:00
Axel Huebl
47abe5f225 FindMPI: Fix regression in pthread guard 
Fix a regression with MPI and CUDA<10.2 that did let `-pthread` flags
slip to nvcc again.  In commit b725a19072 (FindMPI: Deny -fexceptions
from NVCC, 2020-07-02, v3.18.0-rc4~12^2) we accidentally forgot to use
the variable containing the replacement result.

Fixes: #21108
 2020-08-20 06:52:45 -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
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
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
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
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
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
Brad King
7b083d59c2 clang-cl: Restore rules to create preprocessed and assembly output 
In commit d993ebd4ca (clang-cl: Add '--' before source file, 2020-07-28)
we accidentally replaced these rules with those to compile an object
file.
 2020-08-19 10:53:48 -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
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
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
Marc Chevrier
72822e26c9 FindPython: enhance robustness of version extraction from library name 
Fixes: #21105
 2020-08-18 12:30:47 +02: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
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
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
Sylvain Corlay
1925f9d8eb FindOpenSSL: Add support for finding static libraries 
Fixes: #20903
 2020-08-13 17:59:13 +02: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
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
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
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
Tim Blechmann
6d231b494f FindX11: Add xcb_util and xcb_xfixes libraries 2020-08-12 14:01:01 +08:00
Raul Tambre
f7347f28c7 MSVC: Record support for C11 and c_restrict 
MSVC >=19.27 supports a C11 switch.
The `c_restrict` feature has also been implemented.

Fixes: #21069
 2020-08-11 09:08:21 -04:00
Brad King
0cd3b5d0ca Merge topic 'findlapack-quiet' 
c156704ff0 FindLAPACK: Use find_package_handle_standard_args

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5110
 2020-08-11 08:57:54 -04:00
Brad King
b995e2db38 Merge topic 'findhdf5-fix-nohl' 
e038107ee7 FindHDF5: fix compiler detection when HL is disabled

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5112
 2020-08-11 08:55:46 -04:00
Brad King
9ccd13d8cd Merge topic 'findhdf5-fix-nohl' into release-3.18 
e038107ee7 FindHDF5: fix compiler detection when HL is disabled

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5112
 2020-08-11 08:55:45 -04:00
Brad King
121c3717ee Merge topic 'automoc-path-prefix-off' 
5b5be34811 Help: Add 3.18.2 release note about AUTOMOC_PATH_PREFIX default change
db659e18bc Merge branch 'backport-3.17-automoc-path-prefix-off'
e503fbe38a Merge branch 'backport-3.16-automoc-path-prefix-off'
4c33b305a0 Autogen: Turn off moc path prefix generation by default

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5105
 2020-08-11 08:51:02 -04:00
Brad King
e524819483 Merge topic 'automoc-path-prefix-off' into release-3.18 
5b5be34811 Help: Add 3.18.2 release note about AUTOMOC_PATH_PREFIX default change
db659e18bc Merge branch 'backport-3.17-automoc-path-prefix-off'
e503fbe38a Merge branch 'backport-3.16-automoc-path-prefix-off'
4c33b305a0 Autogen: Turn off moc path prefix generation by default
56510b7d85 Merge branch 'backport-test-FindPkgConfig-isolate-env' into release-3.17
effc9a1032 Merge branch 'backport-3.17-automoc_timestamp_deps' into release-3.17
507fecd7e2 Merge branch 'ninja-multi-rsp-remove-path' into release-3.17

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5105
 2020-08-11 08:51:01 -04:00
Marc Chevrier
951640f1f9 FindPython: manage SOABI for all Python versions 
Fixes: #21070
 2020-08-11 10:16:40 +02:00