Commit Graph

46137 Commits

Author SHA1 Message Date
Brad King 7d69ab02ad Merge topic 'FindProtobuf-no-protoc'
db0b740fd8 FindProtobuf: Do not verify protoc version if it is not found

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4121
2019-12-17 11:08:12 -05:00
Brad King 671ed5b123 Merge topic 'fat-ios'
a9b41195d2 Handle multi-arch sysroots on Apple platforms
372c89ea38 Refactor -arch and -isysroot code usage
7a44e16d7f Refactor SDK name to path into a function
777d364913 Use xcrun instead of xcodebuild for resolving SDK path

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4125
2019-12-17 11:07:09 -05:00
Kitware Robot d082d0e109 CMake Nightly Date Stamp 2019-12-17 00:01:16 -05:00
Diego Pino Garcia db0b740fd8 FindProtobuf: Do not verify protoc version if it is not found 2019-12-16 11:43:47 -05:00
Brad King 5ba141e5ff Merge branch 'release-3.15' 2019-12-16 11:23:56 -05:00
Brad King 5b43aa7755 CMake 3.15.6 v3.15.6 2019-12-16 10:21:27 -05:00
Brad King 19f04031b6 Merge topic 'ninja-multi'
8c062f9d99 Help: Add documentation and release notes for multi-config Ninja
e0478cc646 Tests: Add test for Multi-Configuration Ninja generator
5a8a9f7229 Ninja: Add multi-config variant
3bc63e99e4 Refactor: Prepare Ninja generator for multi-config

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4086
2019-12-16 10:06:48 -05:00
Brad King a1dc0a3a22 Merge topic 'bootstrap-intel'
033a4b12a5 bootstrap: Extend C++17 check for our cast functions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4139
2019-12-16 10:05:53 -05:00
Brad King 43e6254a17 Merge topic 'test-vtk'
59e2e72159 Tests/Contracts: Update VTK repository URL

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4138
2019-12-16 10:05:18 -05:00
Brad King 50ee80dff7 Merge branch 'release-3.16' 2019-12-16 10:04:03 -05:00
Brad King fe7626da54 Merge topic 'pch-force-include'
c5c218fa0d PCH: Append pch header file to list of forced include files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4135
2019-12-16 10:04:03 -05:00
Brad King dfbe8109b4 Merge topic 'pch-force-include' into release-3.16
c5c218fa0d PCH: Append pch header file to list of forced include files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4135
2019-12-16 10:04:03 -05:00
Kitware Robot b289544810 CMake Nightly Date Stamp 2019-12-16 00:01:08 -05:00
Kitware Robot 15b5921ad1 CMake Nightly Date Stamp 2019-12-15 00:01:08 -05:00
Brad King 033a4b12a5 bootstrap: Extend C++17 check for our cast functions
In commit fc3b4caa2e (Memory management: cast functions for managed pointers,
2019-11-18) we added a check to `Source/Checks/cm_cxx17_check.cpp` to avoid
using C++17 mode on a compiler that does not support all our C++17 usage.
Add the check to our bootstrap script too.
2019-12-14 13:30:54 -05:00
Brad King 59e2e72159 Tests/Contracts: Update VTK repository URL
The vtk.org/vtk.git repository has long been superseded by the
repository on gitlab.kitware.com.  The former is no longer available.
2019-12-14 12:55:26 -05:00
Kitware Robot 2d53894c31 CMake Nightly Date Stamp 2019-12-14 00:01:12 -05:00
Kyle Edwards 8c062f9d99 Help: Add documentation and release notes for multi-config Ninja 2019-12-13 10:52:07 -05:00
Kyle Edwards e0478cc646 Tests: Add test for Multi-Configuration Ninja generator 2019-12-13 10:52:07 -05:00
Kyle Edwards 5a8a9f7229 Ninja: Add multi-config variant
Co-Authored-by: vector-of-bool <vectorofbool@gmail.com>
2019-12-13 10:51:46 -05:00
Kyle Edwards 3bc63e99e4 Refactor: Prepare Ninja generator for multi-config 2019-12-13 10:51:46 -05:00
Brad King 4047056a54 Merge branch 'release-3.15' 2019-12-13 10:37:43 -05:00
Brad King 8437cbd636 Merge branch 'release-3.16' 2019-12-13 10:36:36 -05:00
Brad King ff67b24ecd Merge topic 'FindBLAS-OpenBLAS-thread'
d1e111d166 FindBLAS: Consider OpenBLAS with thread libraries only with C or CXX

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4134
2019-12-13 10:36:36 -05:00
Brad King e3059f7bb4 Merge topic 'FindBLAS-OpenBLAS-thread' into release-3.16
d1e111d166 FindBLAS: Consider OpenBLAS with thread libraries only with C or CXX

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4134
2019-12-13 10:36:35 -05:00
Tor Arne Vestbø a9b41195d2 Handle multi-arch sysroots on Apple platforms 2019-12-13 16:35:38 +01:00
Brad King 3c1904b417 Merge branch 'release-3.16' 2019-12-13 10:31:41 -05:00
Brad King c55b4b4b24 Merge topic 'backport-3.16-vs-v142-version' into release-3.16
2f853eec3d Merge branch 'backport-3.15-vs-v142-version' into backport-3.16-vs-v142-version
d8d4924d98 VS: Fix support for v142 toolset minor versions in VS 16.5+
07612646fe VS: Fix support for v142 toolset minor versions in VS 16.5+

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4133
2019-12-13 10:31:41 -05:00
Brad King cffd618230 Merge topic 'backport-3.16-vs-v142-version'
2f853eec3d Merge branch 'backport-3.15-vs-v142-version' into backport-3.16-vs-v142-version
d8d4924d98 VS: Fix support for v142 toolset minor versions in VS 16.5+
07612646fe VS: Fix support for v142 toolset minor versions in VS 16.5+

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4133
2019-12-13 10:31:41 -05:00
Cristian Adam c5c218fa0d PCH: Append pch header file to list of forced include files
Fixes: #20088
2019-12-13 15:21:27 +01:00
Kitware Robot c34d05a11e CMake Nightly Date Stamp 2019-12-13 00:01:12 -05:00
Kyle Edwards 966a9eece3 Merge topic 'function-var-current'
24fdd51f45 Refactor: Replace CMAKE_CURRENT_LIST_DIR with CMAKE_CURRENT_FUNCTION_LIST_DIR
90e3e2a777 cmFunctionCommand: Introduce `CMAKE_CURRENT_FUNCTION*` variables
dd54290dab Refactor: Modernize `function` command

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !4000
2019-12-12 14:00:41 -05:00
Brad King d71591dfd5 Merge branch 'FindBLAS-OpenBLAS-thread' into release-3.15
Merge-request: !4134
2019-12-12 12:13:10 -05:00
Brad King d1e111d166 FindBLAS: Consider OpenBLAS with thread libraries only with C or CXX
The check added by commit 276b56f01c (FindBLAS: Add second try for
OpenBLAS with thread libraries., 2019-06-07, v3.15.0-rc2~5^2) can
work only when C or CXX is enabled.

Fixes: #20092
2019-12-12 12:10:47 -05:00
Brad King f6e29e0405 Merge topic 'link-options-propagation'
af9d4f24ae Link properties: must be transitive over private dependency on static library

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4130
2019-12-12 12:05:57 -05:00
Marc Chevrier af9d4f24ae Link properties: must be transitive over private dependency on static library
Ensure transitivity over multiple static libraries.

Fixes: bbba701899 (Link properties: must be transitive over private dependency on static library, 2019-12-06)
2019-12-12 18:02:32 +01:00
Brad King 4fb9c88042 Merge topic 'add_cuda_meta_compiler_features'
2467a2b318 CUDA: Add cuda meta-features (e.g. ``cuda_std_11``) support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3992
2019-12-12 11:57:18 -05:00
Brad King bd855ffb55 Merge topic 'FindThreads-tsan'
b328cbaadb FindThreads: Add pthread_cancel to program to test for pthreads in libc

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Rolf Eike Beer <eike@sf-mail.de>
Merge-request: !4056
2019-12-12 11:55:52 -05:00
Brad King 0e0571599f Merge topic 'ctest-drmemory-support'
676befdf52 ctest: add support for memcheck using Dr. Memory
2db0a65f56 cmCTestMemCheckHandler.cxx: minor refactoring

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4119
2019-12-12 11:54:54 -05:00
Brad King b3a536e726 Merge branch 'backport-3.15-vs-v142-version' into release-3.15
Merge-request: !4133
2019-12-12 11:38:15 -05:00
Brad King 2f853eec3d Merge branch 'backport-3.15-vs-v142-version' into backport-3.16-vs-v142-version 2019-12-12 11:34:33 -05:00
Brad King d8d4924d98 VS: Fix support for v142 toolset minor versions in VS 16.5+
The fix in commit 5117389931 (VS: Fix support for v142 toolset minor
versions, 2019-10-01, v3.16.0-rc1~32^2) worked around a bug in VS's
placement of toolset files.   VS 16.5 will fix that bug and restore the
original pattern for locations of toolset files.  Update our logic to
look for both possibilities.

Issue: #19779
2019-12-12 11:28:34 -05:00
Brad King 07612646fe VS: Fix support for v142 toolset minor versions in VS 16.5+
The fix in commit 5117389931 (VS: Fix support for v142 toolset minor
versions, 2019-10-01, v3.15.5~6^2) worked around a bug in VS's placement
of toolset files.   VS 16.5 will fix that bug and restore the original
pattern for locations of toolset files.  Update our logic to look for
both possibilities.

Issue: #19779
2019-12-12 11:25:42 -05:00
Kitware Robot 81f5fe8463 CMake Nightly Date Stamp 2019-12-12 00:01:17 -05:00
Kyle Edwards 106137492b Merge topic 'ctest-configuration-type'
e6f758be6d ctest: Populate CTEST_CONFIGURATION_TYPE from the -C command line when set

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4109
2019-12-11 11:00:13 -05:00
Kyle Edwards 651b5d157a Merge topic 'cpack-use-CPACK_PACKAGE_HOMEPAGE_URL'
3476dbe6d7 CPack: CMAKE_PROJECT_HOMEPAGE_URL -> CPACK_PACKAGE_HOMEPAGE_URL

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4024
2019-12-11 10:59:29 -05:00
Brad King 2a26a6de01 Merge topic 'msvc-arm64-windows10'
ea882b4aa9 MSVC: Fixed missing import library for Windows 10 ARM64 (Desktop)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4129
2019-12-11 10:31:23 -05:00
Brad King a97aeb0f23 Merge topic 'modernize-memory-management'
36c8cae2e8 cmLocalGenerator: modernize memory management

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4124
2019-12-11 10:30:30 -05:00
Cristian Morales Vega b328cbaadb FindThreads: Add pthread_cancel to program to test for pthreads in libc
When using ThreadSanitizer our existing CMAKE_HAVE_LIBC_PTHREAD test
program links using symbols from the tsan library.  Among the symbols
not provided by that library, `pthread_cancel()` seems to be the less
risky symbol to add to the check.

Fixes: #19981
2019-12-11 09:26:39 -05:00
Cristian Adam 372c89ea38 Refactor -arch and -isysroot code usage 2019-12-11 12:45:16 +01:00