mirrors/cmake
2
0
Fork 0
mirror of https://gitlab.kitware.com/cmake/cmake.git synced 2026-09-28 04:09:35 +03:00
Code Activity
47,352 Commits 2 Branches 414 Tags
94de927cab19609aeeff032c64f16cfd257fca2f
Commit Graph
10291 Commits
Author SHA1 Message Date
Brad King bcb0816cf9 Merge topic 'InstallRequiredSystemLibraries-redist' into release-3.16 
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 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
Ben Boeckel af158149e7 FindOpenSSL: do not mark a local variable as advanced 2020-01-20 15:49:29 -05:00
Ben Boeckel 74f659f1f2 FindCurses: only mark CURSES_EXTRA_LIBRARY when it is used 2020-01-20 15:49:29 -05:00
Ben Boeckel 7e2ae4e96d FindOpenGL: only mark declared cache variables as advanced 2020-01-20 15:49:29 -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
Mario Emmenlauer 7346a3226f Find{BLAS,LAPACK}: Clarify names of internal helper macro 
Also clarify names of their arguments.
 2020-01-20 11:30:53 -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 4c907eae69 Merge topic 'findopenssl-dependencies-link-order' into release-3.16 
d2880aaa06 FindOpenSSL: Fix ordering of dependency link flags

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4235
 2020-01-17 09:25:23 -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 8cd35baae9 Merge topic 'nag-submodule' into release-3.16 
f7f60ddcf9 Fortran: Add support for NAG Fortran submodules

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4229
 2020-01-16 10:56:02 -05:00
Ashley Whetter d2880aaa06 FindOpenSSL: Fix ordering of dependency link flags 
Fixes: #20082, #20224
 2020-01-16 10:53:19 -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 f0986f62a8 Merge topic 'python39' into release-3.16 
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
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 7cc02a0c29 FindLua: only mark LUA_MATH_LIBRARY as advanced if required 2020-01-14 17:45:23 -05:00
Ben Boeckel 85cd26b8a6 FindBoost: only mark Boost_DIR as advanced if defined 2020-01-14 17:45:22 -05:00
Ben Boeckel 338c7916ba CTest: avoid marking undeclared cache variables as advanced 2020-01-14 17:40:29 -05:00
Ben Boeckel b6c7a10b23 CPack: mark options as advanced only if defined 2020-01-14 17:40:29 -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 e6c5bed2aa Merge topic 'FindMatlab-r2019' into release-3.16 
edb6fe3b6a FindMatlab: add R2019a and R2019b MATLAB_VERSIONS_MAPPING

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4207
 2020-01-14 08:57:18 -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
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 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 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 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