mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-26 00:20:06 -06:00
Code Issues Packages Projects Releases Wiki Activity
46,364 Commits 2 Branches 386 Tags
97c124e30f530f64fafdc2b3a9decd1bf31bcf9c
Commit Graph

9994 Commits

Author SHA1 Message Date
Dan Johnston
97c124e30f Ninja: Add a separate job pool for PCH creation 
Add a `JOB_POOL_PRECOMPILE_HEADER` target property to specify the pool
name, and its associated `CMAKE_JOB_POOL_PRECOMPILE_HEADER` variable.

Fixes: #20217
 2020-01-16 10:32:25 -05:00
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
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
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
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
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
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
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
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
Kyle Edwards
d491f34a5e CPack: Fix regression in DEB generator description 
Fixes: #20102
 2020-01-10 17:22:52 -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
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
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
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
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
Cristian Adam
7347e2f830 ObjC: Add VISIBLITY_INLINES_HIDDEN support 
Fixes: #20193
 2020-01-10 16:31:27 +01:00
Marc Chevrier
fcde42751a FindPython: ensure new Xcode framework for Python3 is detected 2020-01-10 13:48:39 +01:00
Marc Chevrier
dd7b741b81 macOS: Add support for new Xcode 11 frameworks directory 
Update CMAKE_SYSTEM_FRAMEWORK_PATH with new Xcode 11 frameworks directory
 2020-01-10 13:48:39 +01:00
Brad King
08c5b3eff0 GNUtoMS: Add search path for VS 2019 environment scripts 
Extend the logic from commit abe8a623d9 (GNUtoMS: Add search path for VS
2017 environment scripts, 2017-05-19, v3.8.2~1^2) to consider VS 2019
paths too.

Fixes: #20162
 2020-01-09 16:56:30 -05:00
Cristian Adam
1a9f6bad98 ObjC: Add _COMPILE_LAUNCHER support 
Fixes: #20178
 2020-01-09 13:52:37 -05:00
Marc Chevrier
61502d3956 FindPython: Add variable Python_SOABI 
This variable holds the standard extension suffix for modules.

Fixes: #20150
 2020-01-09 14:43:22 +01:00
Marc Chevrier
635225513e Merge topic 'fix-check-compiler-flag-gcc-9' 
8b10e493ac check_LANG_compiler_flag: add the "deprecated switch" message for GCC

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4165
 2020-01-09 05:29:21 -05:00
Sylvain Joubert
4041cf5f61 FindLibXml2: ensure consistent paths, version and flag information 
As pkg-config is used as hint to perform the actual lookup of libraries
and include paths we may not find the pkg-config installation.
Mainly this makes sure the pkg-config information are used only if the
actual installation reported to the user is the one from pkg-config.

Fixes: #20149
 2020-01-07 15:50:10 +01:00
Patrick Storz
9d2816544e CPack/NSIS: Also preload the "UserInfo.dll" plugin 
This is currently used to provide
UserInfo::GetName and UserInfo::GetAccountType functions.
 2020-01-04 18:20:27 +01:00
Patrick Storz
13567bd186 CPack/NSIS: Avoid "setup loading" screen by fixing template order 
NSIS packages files (including those required by the installer itslef)
in the order in which they're mentioned in the .nsi file.

If solid compression is used, the installer might need to extract
large parts of the archive to be able to even start the setup program
("Please wait while setup is loading...").

Avoid this by moving component installation towards the end of the
template file.
 2020-01-04 18:18:18 +01:00
Raul Tambre
7560c68f2c CUDA: Fix compiler option version checks for nvcc 10.2.19 2020-01-03 14:15:03 +02:00
Ashley Whetter
90973c4abd FindOpenSSL: Fix ordering of dependency link flags 
Fixes: #20082
 2019-12-31 15:01:35 -08:00
Sylvain Joubert
a179cbf205 FindLibXml2: provide imported target LibXml2::xmllint 2019-12-31 12:45:26 +01:00
Alessandro Menti
8b10e493ac check_LANG_compiler_flag: add the "deprecated switch" message for GCC 
Add the "deprecated switch" message for GCC to
CMakeCheckCompilerFlagCommonPatterns.cmake.
 2019-12-30 11:14:12 +01:00
Kyle Edwards
979faa4696 Merge topic 'implib' 
576c2e7a2d Swift: move windows handling into platform file (NFC)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4156
 2019-12-26 11:00:25 -05:00
Marc Chevrier
417c533010 Merge topic 'findpython_conda_support' 
776d27d4a4 FindPython: Extend virtual environment handling by considering conda

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4155
 2019-12-23 06:33:54 -05:00
Saleem Abdulrasool
576c2e7a2d Swift: move windows handling into platform file (NFC) 
This moves the definition of the import library flags for Windows into a
platform specific file (much like the Darwin `-sdk` flag).  This is in
preparation for re-use of the flag to make the flags handling for
executables more precise.
 2019-12-21 18:25:54 -08:00
Sebastian Müller
776d27d4a4 FindPython: Extend virtual environment handling by considering conda 
- Add functionality to recognize and use CONDA_PREFIX environment variable
- Add tests for conda virtual environments
- Fixes: #20111
 2019-12-21 15:38:00 +01:00
Kyle Edwards
3e07995bdd Merge topic 'FindPython-Fix-target-properties' 
fe280e0cda FindPython*: Fix erroneous target properties setting

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !4154
 2019-12-20 12:57:07 -05:00
Marc Chevrier
fe280e0cda FindPython*: Fix erroneous target properties setting 
Property IMPORTED_CONFIGURATIONS for targets Python*::Python
and Python*::Module is not correctly set.
 2019-12-19 19:42:24 +01:00
Brad King
118f7efba9 Merge topic 'FindLAPACK-in-blas' into release-3.16 
930f204b68 FindLAPACK: Fix support for LAPACK symbols inside BLAS libraries

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4144
 2019-12-18 09:33:21 -05:00
Brad King
5b4921d19b Merge topic 'FindLAPACK-in-blas' 
930f204b68 FindLAPACK: Fix support for LAPACK symbols inside BLAS libraries

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4144
 2019-12-18 09:33:21 -05:00
Brad King
62475f7da0 Merge topic 'FindBoost-1.72' into release-3.16 
e51232b739 FindBoost: Add support for Boost 1.72

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4143
 2019-12-18 09:32:41 -05:00
Brad King
5668428400 Merge topic 'FindBoost-1.72' 
e51232b739 FindBoost: Add support for Boost 1.72

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4143
 2019-12-18 09:32:41 -05:00
Brad King
930f204b68 FindLAPACK: Fix support for LAPACK symbols inside BLAS libraries 
Fix the condition added by commit 68dcbeee01 (FindLAPACK: Test for
implicitly linked LAPACK libraries, 2019-06-11, v3.16.0-rc1~560^2) to
use BLAS libraries if they are sufficient with no dedicated LAPACK
libraries.

Fixes: #20099
 2019-12-18 05:51:50 -05:00
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
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
Brad King
e51232b739 FindBoost: Add support for Boost 1.72 
Run `Utilities/Scripts/BoostScanDeps.cmake` with the Boost 1.72.0
sources to compute dependencies.

Fixes: #20100
 2019-12-17 10:37:06 -05:00
Robert Maynard
d484a3c4d8 FindCUDAToolkit: correct searches for Toolkit components 2019-12-16 14:35:03 -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