mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-29 02:19:18 -05:00
Code Issues Packages Projects Releases Wiki Activity
46,518 Commits 2 Branches 401 Tags
fbd3ea2047bf1a09ff24d9a04078b75438ebd46b
Commit Graph

10055 Commits

Author SHA1 Message Date
Stephen McDowell 29560bf07b FindCUDAToolkit: Import targets for toolkit libraries 2019-12-16 10:31:43 -05:00
Stephen McDowell 2c0ff263b4 FindCUDAToolkit: Add module to find the CUDA Toolkit 2019-12-16 10:31:43 -05:00
Robert Maynard 12d324e55d CUDA: Persist SIZEOF_VOID_P and PLATFORM_ABI 
The CUDA language failed to persist CMAKE_SIZEOF_VOID_P
and CMAKE_INTERNAL_PLATFORM_ABI, causing find_ calls to fail when
the only enabled language was CUDA. This specifically occurred
when having to locate libraries inside `lib64` directories.
 2019-12-16 10:31:43 -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 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
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 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 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
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
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 7a44e16d7f Refactor SDK name to path into a function 2019-12-11 11:55:46 +01:00
Robert Maynard 2467a2b318 CUDA: Add cuda meta-features (e.g. `cuda_std_11`) support 2019-12-10 17:56:48 -05:00
Dietmar Scheidl 676befdf52 ctest: add support for memcheck using Dr. Memory 
Fixes: #19788
 2019-12-10 14:42:30 -05:00
shibayan ea882b4aa9 MSVC: Fixed missing import library for Windows 10 ARM64 (Desktop) 
Add the same import library as x86/x64 by default for Windows 10 ARM64 (Desktop, not UWP).

Fixes: #20077
 2019-12-11 02:40:46 +09:00
Alex Turbov 24fdd51f45 Refactor: Replace CMAKE_CURRENT_LIST_DIR with CMAKE_CURRENT_FUNCTION_LIST_DIR 
Some modules define an intermediate global scope visible variables
to access "resource" files from functions.
Now these variables could be eliminated.
 2019-12-10 16:43:27 +02:00
Brad King db127457e3 Merge topic 'wxwidgets_macos_weakframework' into release-3.16 
ada1824dc5 FindwxWidgets: Add support for 3.1.3 on macOS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4126
 2019-12-10 09:29:01 -05:00
Brad King 6dffb10444 Merge topic 'wxwidgets_macos_weakframework' 
ada1824dc5 FindwxWidgets: Add support for 3.1.3 on macOS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4126
 2019-12-10 09:29:01 -05:00
Brad King 724aa9fd3c Merge topic 'toc_on_ppc' 
cb984c6627 Check*CompilerFlag: Modernize modules
d806263578 Merge branch 'backport-3.16-toc_on_ppc' into toc_on_ppc
90d8bd2deb Merge branch 'backport-3.15-toc_on_ppc' into backport-3.16-toc_on_ppc
b35926e260 Check for support before adding bigtoc linker flag
958f858ad8 Check for support before adding bigtoc linker flag
8c7b7df788 bootstrap: Add target_link_options command

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4122
 2019-12-10 09:16:20 -05:00
Tobias Taschner ada1824dc5 FindwxWidgets: Add support for 3.1.3 on macOS 
Previously only -framework was used starting with 3.1.3 -weak_framework
might also be used and has to be handled.
 2019-12-10 09:11:14 -05:00
Alex Turbov 3476dbe6d7 CPack: CMAKE_PROJECT_HOMEPAGE_URL -> CPACK_PACKAGE_HOMEPAGE_URL 
At CPack running time the `CMAKE_PROJECT_HOMEPAGE_URL` variable
is not set.

Internal CPack modules (e.g. CPackDEB, CPackRPM, CPackFreeBSD)
should use `CPACK_PACKAGE_HOMEPAGE_URL` instead, which is available
after inclusion of `CPack.cmake` into `CMakeLists.txt`.

Closes: #19607
 2019-12-09 17:06:10 -05:00
Alexander Grund cb984c6627 Check*CompilerFlag: Modernize modules 
- User lower-case names
- Wrap in function instead of macro to avoid set-unset calls
- Use IN LISTS for foreach
 2019-12-09 14:15:42 -05:00
Brad King 3d1a939af1 Merge branch 'backport-3.15-FindGTK2-harfbuzz' into release-3.15 
Merge-request: !3877
 2019-12-09 13:23:38 -05:00
Markus Mittendrein e4b1b79abb FindGTK2: Add harfbuzz to GTK2_INCLUDE_DIRS 
Fixes: #19531
 2019-12-09 12:04:33 -05:00
Brad King b2634d639b Merge topic 'cuda_updates_for_10.2' 
5341f5e4a1 CUDA: get header deps from compiler invocation when possible
7f15c99851 CUDA: forward unknown flags to host compiler when possible.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4099
 2019-12-09 11:21:58 -05:00
Brad King 51b87bcc62 Merge topic 'CPackNuGet-version-spec' 
161a19e547 CPackNuGet: Fix handling of version specs with '['

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4082
 2019-12-09 11:20:55 -05:00
Brad King 1da7fa3b47 Merge topic 'compiler-launcher-env' 
6f48c59257 launcher: support setting a compiler launcher through the environment

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4095
 2019-12-09 11:19:57 -05:00
Kyle Edwards 5d6b70ccfe Merge topic 'libarchive-target' 
30488b3b9f FindLibArchive: create a target

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4117
 2019-12-09 09:59:53 -05:00
Tor Arne Vestbø 777d364913 Use xcrun instead of xcodebuild for resolving SDK path 
It's much cheaper to run.
 2019-12-09 14:55:48 +01:00
Yacoub Hossain 161a19e547 CPackNuGet: Fix handling of version specs with '[' 
Build a string directly to avoid depending on CMake lists which do
not handle square brackets in values very well.

Fixes: #20010
 2019-12-06 09:14:36 -05:00
Brad King 4ec0572736 Merge topic 'vs-clangcl-toolset' 
3c125c6de0 VS: Support Visual Studio Clang Toolkit identification

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4111
 2019-12-06 08:37:37 -05:00
T.J. Corona 30488b3b9f FindLibArchive: create a target 2019-12-05 17:18:28 -05:00
Ben Boeckel 6f48c59257 launcher: support setting a compiler launcher through the environment 
This makes it much easier to use a launcher for all CMake projects in an
environment rather than having to remember to pass the setting to every
CMake build.
 2019-12-05 14:25:36 -05:00
Justin Goshi 3c125c6de0 VS: Support Visual Studio Clang Toolkit identification 
Teach CMake that the `ClangCl` toolset uses the `ClangClExecutable`
value as the path to the compiler executable.
 2019-12-05 11:48:48 -05:00
Brad King 4c94b53b73 Merge topic 'FindPkgConfig-cross-compile' 
f92a4b2399 FindPkgConfig: Fix path manipulations when cross compiling

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4106
 2019-12-05 11:47:10 -05:00
Brad King 2557794609 Merge topic 'FindBLAS-atlas-static' 
85f4d580c9 FindBLAS: Search for libblas from ATLAS vendor

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4105
 2019-12-05 11:45:57 -05:00
Brad King 632bd60515 Merge topic 'FindPNG-static-dep-m' 
ad41c98cbb FindPNG: add 'm' dependencies to static lib on Linux

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4096
 2019-12-05 11:42:33 -05:00
Brad King 158839f0db Merge topic 'FindThreads-lib-flag' into release-3.16 
f7ffefea7c FindThreads: Restore hard-coded '-l' flag on library name

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4112
 2019-12-05 11:40:35 -05:00
Brad King 625b120572 Merge topic 'FindThreads-lib-flag' 
f7ffefea7c FindThreads: Restore hard-coded '-l' flag on library name

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4112
 2019-12-05 11:40:35 -05:00
Brad King a795aa145c Merge topic 'pch-xcode-no-warning' 
df8372da09 PCH: Do not add #pragma system_header for Xcode generator

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4098
 2019-12-05 11:39:24 -05:00
Eisuke Kawashima 85f4d580c9 FindBLAS: Search for libblas from ATLAS vendor 
Symbols such as `cblas_ccopy` are defined in `libblas.a` but NOT IN
`libf77blas.a`.

Fixes: #14320
 2019-12-04 14:53:40 -05:00
Brad King f55593a607 Merge topic 'ninja-tool' 
feb5cb8d9d Ninja: Prefer first ninja tool available in PATH

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4091
 2019-12-04 14:18:23 -05:00
Brad King 73848a75e8 Merge topic 'cuda_lang_specifies_cmake_library_arch' 
974220b714 CUDA: persist CMAKE_LIBRARY_ARCHITECTURE and CUDA version

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4090
 2019-12-04 14:17:37 -05:00