mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-03-02 20:58:58 -06:00
Code Issues Packages Projects Releases Wiki Activity
46,152 Commits 2 Branches 391 Tags
3289322e4f05ef4f092d6ed0bc0b57d66c911c64
Commit Graph

46152 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King
3289322e4f Merge topic 'FindCUDAToolkit-module' 
d484a3c4d8 FindCUDAToolkit: correct searches for Toolkit components
e2a5d8374f FindCUDAToolkit: Improve usage, library set, and tests
29560bf07b FindCUDAToolkit: Import targets for toolkit libraries
2c0ff263b4 FindCUDAToolkit: Add module to find the CUDA Toolkit
12d324e55d CUDA: Persist SIZEOF_VOID_P and PLATFORM_ABI

Acked-by: Kitware Robot <kwrobot@kitware.com>
Rejected-by: Brad King <brad.king@kitware.com>
Acked-by: Brad King <brad.king@kitware.com>
Merge-request: !4093
 2019-12-17 11:13:50 -05:00
Brad King
1369db7406 Merge topic 'better_category_for_target_debug_property' 
b23c778034 CMAKE_DEBUG_TARGET_PROPERTIES to `provides information` section

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4142
 2019-12-17 11:13:02 -05:00
Brad King
37a30f228a Merge topic 'fix-vs-winrt-by-default' 
557ea4614e VS: Change CMAKE_VS_WINRT_BY_DEFAULT to not implicitly enable WinRT
7bcef355bf Vs: Add test for VS_WINRT_BY_DEFAULT

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4127
 2019-12-17 11:11:24 -05:00
Brad King
2d17101269 Merge topic 'vs-xml-improve' 
d8f1736dcc cmVisualStudio10TargetGenerator: improve XML element generation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4140
 2019-12-17 11:10:21 -05:00
Brad King
64e2891cbd Merge topic 'stdstring-target' 
c34b4497f8 cmTarget: add std::string overloads

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4137
 2019-12-17 11:09:20 -05:00
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
Robert Maynard
b23c778034 CMAKE_DEBUG_TARGET_PROPERTIES to provides information section 
This variable only provides debug information and doesn't modify
the output of CMake, so move it to the correct variable
section.
 2019-12-16 17:05:12 -05:00
Robert Maynard
d484a3c4d8 FindCUDAToolkit: correct searches for Toolkit components 2019-12-16 14:35:03 -05:00
Petr Polezhaev
557ea4614e VS: Change CMAKE_VS_WINRT_BY_DEFAULT to not implicitly enable WinRT 
Original behaviour would unconditionally enable WinRT for all projects
so source file flag generation code can acknowledge WinRT being present
and disable it for C language source files.  An unintentional result of
that approach is that WinRT is enabled for ALL projects, including C++
projects/source files with no way to disable it

Instead use `CMAKE_VS_WINRT_BY_DEFAULT` as a hint that the platform is
WinRT-by-default and set global `CompileAsWinRT` flag to `false` unless
it was explicitly requested by either `WINRT_COMPONENT` option or `/ZW`
compilation option - similar to what Windows Phone/Windows Store
platform logic does

In case WinRT compilation is enabled for a project by either of
aforementioned methods, C language source file override logic will still
kick in and disable CompileAsWinRT for C source files

Fixes: #20063
 2019-12-16 13:46:59 -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
Robert Maynard
e2a5d8374f FindCUDAToolkit: Improve usage, library set, and tests 
Refined the initial design of FindCUDAToolkit and improve it
by adding more library support, more toolkit information and
tests.
 2019-12-16 11:15:12 -05:00
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
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
Petr Polezhaev
7bcef355bf Vs: Add test for VS_WINRT_BY_DEFAULT 2019-12-16 15:00:44 +03:00
Kitware Robot
b289544810 CMake Nightly Date Stamp 2019-12-16 00:01:08 -05:00
Vitaly Stakhovsky
d8f1736dcc cmVisualStudio10TargetGenerator: improve XML element generation 
When an element is emitted, the newline will be printed first, not last
 2019-12-15 10:08:17 -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
Vitaly Stakhovsky
c34b4497f8 cmTarget: add std::string overloads 2019-12-14 09:30:28 -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