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

46341 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King ba0ae1261a Merge topic 'FindMatlab-r2019' 
edb6fe3b6a FindMatlab: add R2019a and R2019b MATLAB_VERSIONS_MAPPING

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4207
 2020-01-14 08:57:19 -05:00
Brad King 18b9eafed8 Merge branch 'release-3.16' 2020-01-14 08:55:58 -05:00
Brad King 11b6a315af Merge topic 'FindMatlab-only-CXX' 
b704d58f41 FindMatlab: in matlab_add_mex use the correct version file

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Patrik Huber <patrikhuber@gmail.com>
Merge-request: !4206
 2020-01-14 08:55:58 -05:00
Brad King 789bbcddc0 Merge topic 'FindMatlab-only-CXX' into release-3.16 
b704d58f41 FindMatlab: in matlab_add_mex use the correct version file

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Patrik Huber <patrikhuber@gmail.com>
Merge-request: !4206
 2020-01-14 08:55:57 -05:00
Brad King 3617e26d8c Merge topic 'vs_populate_CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES' 
ef4a66d694 CUDA: MSVC generators fill CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4179
 2020-01-14 08:54:57 -05:00
Kitware Robot 2d5e9f3d8c CMake Nightly Date Stamp 2020-01-14 00:01:16 -05:00
Silvio Traversaro b704d58f41 FindMatlab: in matlab_add_mex use the correct version file 
Before this modification, the c_mexapi_version.c file was added to
all mex libraries. However, if the C language was not enabled
in the CMake project configuration, the c_mexapi_version.c file
was ignored, creating linking errors in Windows and macOS.
This commit ensures that in the case only the CXX languages is enabled,
the correct version is passed.

Fixes: #19382
 2020-01-13 10:52:57 -05:00
Silvio Traversaro edb6fe3b6a FindMatlab: add R2019a and R2019b MATLAB_VERSIONS_MAPPING 
Reference for versions: https://www.mathworks.com/products/compiler/matlab-runtime.html

Fixes: #20087
 2020-01-13 10:45:54 -05:00
Brad King 4bac5b628e Merge topic 'target_compile_options-BEFORE-keyword' 
2678e31053 target_compile_options: ensure BEFORE keyword is handled in all scopes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4203
 2020-01-13 10:38:00 -05:00
Brad King 041e58d195 Merge topic 'ninja-cross-build-disable' 
e8032e202e Ninja Multi-Config: Make cross-config building opt-in

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4205
 2020-01-13 10:34:18 -05:00
Brad King 320ad3f31f Merge topic 'findmpi-preserve-include-order' 
5861c6d450 FindMPI: Preserve include order when extracting component directories

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4153
 2020-01-13 10:32:42 -05:00
Brad King 1631db97ec Merge topic 'std-string' 
93e9d10c7f cmCacheManager: more members use std::string

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4186
 2020-01-13 10:31:56 -05:00
Brad King 95e3c8b440 Merge topic 'refactoring-STL-erase_if' 
968477517e Refactoring: suppress cmEraseIf in favor of cm::erase_if
348b60d19d STL support: add c++20 std::erase and std::erase_if functions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Rejected-by: Leonid Pospelov <pospelovlm@yandex.ru>
Merge-request: !4192
 2020-01-13 10:31:05 -05:00
Brad King 9a5d399725 Merge topic 'out-of-dir-link-keyword' 
09721ca078 target_link_libraries: Fix out-of-dir calls with debug/optimized keywords
c40229968c target_link_libraries: Add FIXME comment for out-of-dir genex list

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4202
 2020-01-13 10:29:10 -05:00
Brad King 199e4203f7 Merge branch 'release-3.16' 2020-01-13 10:23:27 -05:00
Brad King e8462a105e Merge topic 'fix-cpack-deb-description-file' into release-3.16 
d491f34a5e CPack: Fix regression in DEB generator description

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4204
 2020-01-13 10:23:26 -05:00
Brad King e61c2ed9ac Merge topic 'fix-cpack-deb-description-file' 
d491f34a5e CPack: Fix regression in DEB generator description

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4204
 2020-01-13 10:23:26 -05:00
Brad King 1d2bead8dd Merge branch 'release-3.16' 2020-01-13 10:22:07 -05:00
Brad King b1a9d49a69 Merge topic 'objc-visibility-inlines' into release-3.16 
7347e2f830 ObjC: Add VISIBLITY_INLINES_HIDDEN support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4199
 2020-01-13 10:22:06 -05:00
Brad King 24d143e0f6 Merge topic 'objc-visibility-inlines' 
7347e2f830 ObjC: Add VISIBLITY_INLINES_HIDDEN support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4199
 2020-01-13 10:22:06 -05:00
Brad King ed16d474ea Merge branch 'release-3.16' 2020-01-13 10:20:59 -05:00
Brad King df1fad32ad Merge topic 'macOS-Xcode-11-frameworks' 
fcde42751a FindPython: ensure new Xcode framework for Python3 is detected
dd7b741b81 macOS: Add support for new Xcode 11 frameworks directory

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4198
 2020-01-13 10:20:59 -05:00
Brad King 01b43e85cf Merge topic 'macOS-Xcode-11-frameworks' into release-3.16 
fcde42751a FindPython: ensure new Xcode framework for Python3 is detected
dd7b741b81 macOS: Add support for new Xcode 11 frameworks directory

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4198
 2020-01-13 10:20:58 -05:00
Kitware Robot e4c0711602 CMake Nightly Date Stamp 2020-01-13 00:01:10 -05:00
Kitware Robot 26e9e091c1 CMake Nightly Date Stamp 2020-01-12 00:01:08 -05:00
Kitware Robot ea851fbe44 CMake Nightly Date Stamp 2020-01-11 00:01:18 -05:00
Marc Chevrier 2678e31053 target_compile_options: ensure BEFORE keyword is handled in all scopes 
Fixes: #20200
 2020-01-11 01:25:25 +01:00
Kyle Edwards d491f34a5e CPack: Fix regression in DEB generator description 
Fixes: #20102
 2020-01-10 17:22:52 -05:00
Kyle Edwards e8032e202e Ninja Multi-Config: Make cross-config building opt-in 
Many users will want to use the Ninja Multi-Config generator like a
traditional Visual Studio-style multi-config generator, which doesn't
mix configurations - custom commands are built using target executables
of the same configuration the command is for. We do not want to force
these people to generate an N*N build matrix when they only need N*1,
especially if they have lots of targets. Add a new variable,
CMAKE_NINJA_CROSS_CONFIG_ENABLE, to opt-in to the cross-config build
matrix.
 2020-01-10 16:31:29 -05:00
Robert Maynard ef4a66d694 CUDA: MSVC generators fill CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES 
Fixes #18733
Correct an oversight where the MSVC generators didn't populate
CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES.
 2020-01-10 16:14:28 -05:00
Chuck Atkins 5861c6d450 FindMPI: Preserve include order when extracting component directories 
Fixes: #20098
 2020-01-10 14:13:44 -05:00
Brad King 75e109a5b3 Merge topic 'nvcc-options-version' 
7560c68f2c CUDA: Fix compiler option version checks for nvcc 10.2.19

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !4161
 2020-01-10 13:54:16 -05:00
Brad King cf79034450 Merge topic 'cpack_nsis_avoid_delay' 
9d2816544e CPack/NSIS: Also preload the "UserInfo.dll" plugin
13567bd186 CPack/NSIS: Avoid "setup loading" screen by fixing template order

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4171
 2020-01-10 13:53:30 -05:00
Kyle Edwards 78f9c9dd0e Merge topic 'nsis-headerimage' 
ebfffc609e CPack/NSIS: Add option for setting MUI_HEADERIMAGE_BITMAP

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4157
 2020-01-10 13:48:47 -05:00
Brad King 4409bfbe9b Merge topic 'bootstrap-release' 
9969efa1ae bootstrap: Build with Release config by default to get optimizations

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4196
 2020-01-10 13:39:35 -05:00
Brad King 2ee6baef4f Merge topic 'ninja-postgen-commands' 
fb18215904 Ninja: clean ninja metadata once generated

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Jan Niklas Hasse <jhasse@bixense.com>
Merge-request: !3316
 2020-01-10 13:30:35 -05:00
Brad King d76e4c147a Merge branch 'release-3.15' 2020-01-10 13:23:07 -05:00
Brad King 9fa8b7d5dd Merge topic 'cuda-device-link-only-cuda' into release-3.16 
7ffa42288e Merge branch 'backport-3.15-cuda-device-link-only-cuda'
071c4f1a2a CUDA: Do not device link if target has no CUDA usage

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4191
 2020-01-10 13:21:12 -05:00
Brad King 67e64092e1 Merge branch 'release-3.16' 2020-01-10 13:21:12 -05:00
Brad King 4a010ee52b Merge topic 'cuda-device-link-only-cuda' 
01c90d76a1 Merge branch 'backport-3.16-cuda-device-link-only-cuda'
7ffa42288e Merge branch 'backport-3.15-cuda-device-link-only-cuda'
071c4f1a2a CUDA: Do not device link if target has no CUDA usage

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4191
 2020-01-10 13:21:12 -05:00
Brad King a7fc5df5d3 Merge topic 'GNUtoMS-vs2019' into release-3.16 
08c5b3eff0 GNUtoMS: Add search path for VS 2019 environment scripts

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4197
 2020-01-10 13:20:03 -05:00
Brad King a004779f95 Merge branch 'release-3.16' 2020-01-10 13:20:03 -05:00
Brad King ba3552dce5 Merge topic 'GNUtoMS-vs2019' 
08c5b3eff0 GNUtoMS: Add search path for VS 2019 environment scripts

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4197
 2020-01-10 13:20:03 -05:00
Brad King a56b862941 Merge branch 'release-3.16' 2020-01-10 13:18:36 -05:00
Brad King 213b03d275 Merge topic 'objc-compiler-launcher' into release-3.16 
a05b9d4239 ObjC: Add _COMPILE_LAUNCHER support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4189
 2020-01-10 13:18:35 -05:00
Brad King eb672da7d4 Merge topic 'objc-compiler-launcher' 
f6ef6e5a73 Merge branch 'backport-3.16-objc-compiler-launcher'
1a9f6bad98 ObjC: Add _COMPILE_LAUNCHER support
a05b9d4239 ObjC: Add _COMPILE_LAUNCHER support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4189
 2020-01-10 13:18:35 -05:00
Brad King fc94de6897 Merge topic 'custom-target-FOLDER' 
353405daef Add support for FOLDER target property to custom targets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4193
 2020-01-10 13:17:28 -05:00
Brad King 18e97c00f4 Merge topic 'reduce_verbosity_find_package_debug_mode' 
6c92df382f find_package: Improve debug logging output

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4175
 2020-01-10 13:16:30 -05:00
Brad King 9f2719b31e Merge topic 'findopenssl-dependencies-link-order' 
90973c4abd FindOpenSSL: Fix ordering of dependency link flags

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4173
 2020-01-10 13:10:42 -05:00
Brad King 09721ca078 target_link_libraries: Fix out-of-dir calls with debug/optimized keywords 
In commit a1ad0a699b (target_link_libraries: Allow use with targets in
other directories, 2018-09-07, v3.13.0-rc1~94^2) we added use of `<...>`
to encode a directory id, but the closing `>` can incorrectly terminate
a surrounding generator expression early.  Encode the directory id using
`(...)` instead.

Fixes: #20202
 2020-01-10 11:40:34 -05:00