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,463 Commits 2 Branches 386 Tags
958df7021f5d677a7ebe112e671f6c9890e6e614
Commit Graph

10025 Commits

Author SHA1 Message Date
Brad King
958df7021f Merge topic 'mingw-find-no-dll' 
afbbfe5109 MinGW: Update find_library to not find plain .dll files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4248
 2020-01-21 09:52:20 -05:00
Brad King
01f0a5d3dd Merge topic 'InstallRequiredSystemLibraries-redist' 
7ca923bcaf IRSL: Install msvcp140_{1,2,codecvt_ids}.dll if available

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Andrey Vihrov <andrey.vihrov@gmail.com>
Merge-request: !4247
 2020-01-21 09:15:17 -05:00
Brad King
afbbfe5109 MinGW: Update find_library to not find plain .dll files 
Modern distributions of packages built with MinGW tools provide `.dll.a`
import libraries.  Prefer those instead of finding plain `.dll` files.
This avoids accidentally finding unrelated Windows `.dll` files.

Fixes: #20019
 2020-01-20 13:31:45 -05:00
Brad King
7ca923bcaf IRSL: Install msvcp140_{1,2,codecvt_ids}.dll if available 
VS now distributes these additional runtime libraries.  Install them if
available.

Fixes: #20228
 2020-01-20 13:19:56 -05:00
Brad King
bf3142e253 Merge topic 'fphsa-name-mismatch' 
be4d1bdf9a FPHSA: acknowledge the name mismatches in CMake-owned modules
ee4673c1ae FPHSA: detect package name mismatches

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Eric Noulard <eric.noulard@gmail.com>
Merge-request: !4123
 2020-01-20 11:53:14 -05:00
Brad King
f80437ad34 Merge topic 'csharp-default-langversion' 
2e882b4275 CSharp: Set C# compiler to default version

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4232
 2020-01-17 09:37:57 -05:00
Brad King
b2edb72642 Merge topic 'nag-submodule' 
f7f60ddcf9 Fortran: Add support for NAG Fortran submodules

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4229
 2020-01-16 10:56:03 -05:00
Brad King
05738b5f21 Merge topic 'pch_job_pool' 
97c124e30f Ninja: Add a separate job pool for PCH creation
ebd0b16ddb vim: Add target_precompile_headers command highlighting

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Cristian Adam <cristian.adam@gmail.com>
Merge-request: !4224
 2020-01-16 10:33:48 -05:00
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
Sumit Bhardwaj
2e882b4275 CSharp: Set C# compiler to default version 
Remove the hard-coded ``/langversion:3`` option and let the compiler
choose the default language version automatically as documented at

    https://docs.microsoft.com/en-us/dotnet/csharp/language-reference/configure-language-version

Fixes: #17674
 2020-01-16 09:34:00 -05:00
Neil Carlson
f7f60ddcf9 Fortran: Add support for NAG Fortran submodules 
They use a `.sub` extension.

Fixes: #20220
 2020-01-15 14:12:22 -05:00
Brad King
9f1ce93d92 Merge topic 'add_cuda_toolkit_tests' 
6e474364d1 CUDAToolkit: No targets now depend on the CUDA runtime
907bb7df57 CUDAToolkit: Gracefully handle missing SDK components
e500eb80cd CUDAToolkit: add_cuda_link_dependency correctly sets dependencies

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4183
 2020-01-15 13:40:07 -05:00
Brad King
513c7bf515 Merge topic 'python39' 
f6474214b3 FindPython: Add support for version 3.9

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Marc Chevrier <marc.chevrier@gmail.com>
Acked-by: Björn Esser <besser82@fedoraproject.org>
Merge-request: !4225
 2020-01-15 13:36:35 -05:00
Ben Boeckel
be4d1bdf9a FPHSA: acknowledge the name mismatches in CMake-owned modules 2020-01-14 17:25:49 -05:00
Ben Boeckel
ee4673c1ae FPHSA: detect package name mismatches 
The `FPHSA_NAME_MISMATCHED` variable may be set if this is intentional
(but should be cleared after the call to not affect other FPHSA calls).
It may also be passed via the `NAME_MISMATCHED` option for new-signature
FPHSA calls.
 2020-01-14 17:25:49 -05:00
Miro Hrončok
f6474214b3 FindPython: Add support for version 3.9 
Development versions of Python 3.9.0 are already out there.

See PEP 596 -- Python 3.9 Release Schedule:
https://www.python.org/dev/peps/pep-0596/
 2020-01-14 15:02:19 -05:00
Robert Maynard
6e474364d1 CUDAToolkit: No targets now depend on the CUDA runtime 
It is not a requirement to have shared|static consistent across your
CUDA libraries (e.g curand, nppc ) and your CUDA runtime library.
It is entirely allowable to use a static nppc and a shared runtime.
 2020-01-14 13:50:37 -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
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
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
Robert Maynard
907bb7df57 CUDAToolkit: Gracefully handle missing SDK components 2020-01-06 09:11:16 -05: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
Robert Maynard
e500eb80cd CUDAToolkit: add_cuda_link_dependency correctly sets dependencies 2020-01-03 16:42:16 -05: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