mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-05 13:20:47 -06:00
Code Issues Packages Projects Releases Wiki Activity
43,940 Commits 2 Branches 385 Tags
92351fe7cd73a756effd5a42ff7f04c2d9beaf88
Commit Graph

9495 Commits

Author SHA1 Message Date
Brad King
92351fe7cd Merge topic 'find_matlab_exact' 
2454fe84f5 FindMatlab: Support EXACT versions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Raffi Enficiaud <raffi.enficiaud@free.fr>
Merge-request: !3460
 2019-06-25 07:07:29 -04:00
Marc Chevrier
9201908ca5 FindPython: add Python_FIND_ABI hint. 
This variable will enable to specify will ABIs will be searched.
 2019-06-24 12:00:21 +02:00
Stefan Lietzau
2454fe84f5 FindMatlab: Support EXACT versions 
If an exact version is requested, don't pick the latest matlab version but the one matching
the requested version.

Fixes: #19155
 2019-06-24 09:27:39 +02:00
Brad King
cecf7e61c4 Merge topic 'BundleUtilities-cleanup' 
8d59ebb704 GetPrerequisites: use CMAKE_OBJDUMP if it is set
e33f4cb0cb BundleUtilities: use if(... IN_LIST ...)
6695383dd5 BundleUtilities: remove needless variable expansions in if() arguments
d5333c0923 BundleUtilities: simplify inclusion of GetPrerequisites

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3447
 2019-06-20 11:43:51 -04:00
Brad King
5773f12d84 Merge topic 'android-pie-cmp0083' 
9e99a95c7d Android: ensure PIE behavior is consistent regardless CMP0083 policy

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3459
 2019-06-19 08:22:17 -04:00
Marc Chevrier
9e99a95c7d Android: ensure PIE behavior is consistent regardless CMP0083 policy 
In commit c4b4d8b3a6 (POSITION_INDEPENDENT_CODE: Manage link flags for
executables, 2018-10-02, v3.14.0-rc1~395^2) we accidentally removed our
Android-specific logic for PIE under the CMP0083 OLD behavior.  Restore
it and also implement Android-specific logic for CMP0083 NEW behavior.

Fixes: #19393
 2019-06-19 08:12:45 -04:00
Brad King
89e80933d6 Merge topic 'FindMPI-imported-link-flags' 
f7eaa342de FindMPI: Store imported target link flags as a list instead of a string

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3449
 2019-06-19 07:26:04 -04:00
Robert Maynard
f7eaa342de FindMPI: Store imported target link flags as a list instead of a string 
We already use the `separate_arguments` `NATIVE_COMMAND` mode to parse
command-line strings into lists in several other places.

Fixes: #18897
 2019-06-19 07:25:05 -04:00
Brad King
a5d4457083 Merge topic 'FindCUDA-more-libs' 
421be81413 FindCUDA: Add nvToolsExt and OpenCL libraries

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3456
 2019-06-19 07:22:50 -04:00
Brad King
7c7c8a01c5 Merge topic 'FindBoost-component' 
830b332f32 FindBoost: Add tests for legacy variables
0dd6772a89 FindBoost: Add legacy variables and targets for compatibility
e4181eeaf2 FindBoost: Don't overwrite Boost_${_comp}_FOUND
4cb652e1d3 Tests.RunCMake.FindBoost: Fix example BoostConfig
7251d54bd1 Tests.FindBoost: Don't use BoostConfig in MODULE test

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3438
 2019-06-19 07:21:02 -04:00
Rolf Eike Beer
8d59ebb704 GetPrerequisites: use CMAKE_OBJDUMP if it is set 2019-06-19 07:14:31 +02:00
Rolf Eike Beer
e33f4cb0cb BundleUtilities: use if(... IN_LIST ...) 2019-06-19 07:14:25 +02:00
Eyal Rozenberg
421be81413 FindCUDA: Add nvToolsExt and OpenCL libraries 
Find these libraries with CUDA 5 and above.

Fixes: #19386
 2019-06-18 08:56:34 -04:00
Alexander Grund
0dd6772a89 FindBoost: Add legacy variables and targets for compatibility 
This allows future BoostConfig to NOT define those and users relying on
them use the newer FindBoost of newer CMake versions
 2019-06-18 08:28:38 -04:00
Alexander Grund
e4181eeaf2 FindBoost: Don't overwrite Boost_${_comp}_FOUND 
Is set in Boost >= 1.71 so don't overwrite it
 2019-06-18 08:25:14 -04:00
Brad King
0a10422418 Merge topic 'cxx_lambda_init_captures_document_why_not_supported_on_gcc48' 
63bf207cd6 CompileFeatures: document why lambda_init_captures requires GCC 4.9

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3452
 2019-06-18 07:59:46 -04:00
Brad King
7af2dedc08 Merge topic 'implicit_lapack_library' 
68dcbeee01 FindLAPACK: Test for implicitly linked LAPACK libraries

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3451
 2019-06-18 07:58:48 -04:00
Rolf Eike Beer
6695383dd5 BundleUtilities: remove needless variable expansions in if() arguments 2019-06-17 17:49:31 +02:00
Rolf Eike Beer
d5333c0923 BundleUtilities: simplify inclusion of GetPrerequisites 2019-06-17 17:49:31 +02:00
Robert Maynard
63bf207cd6 CompileFeatures: document why lambda_init_captures requires GCC 4.9 2019-06-17 09:20:03 -04:00
Jakub Benda
68dcbeee01 FindLAPACK: Test for implicitly linked LAPACK libraries 
Apply the change from commit 5b8f69ebe9 (FindBLAS: Detect implicitly
linked BLAS library, 2018-08-28, v3.13.0-rc1~150^2~2), to FindLAPACK
also.  Typically both BLAS and LAPACK are provided the same way,
e.g. in a Cray Compiler Environment.
 2019-06-17 08:56:05 -04:00
Brad King
24916ce81e Merge topic 'cpack-deb-soname' 
3092c27f30 CPack: Fix SONAME regex in DEB generator

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3440
 2019-06-17 08:05:53 -04:00
Brad King
1e1e306d9a Merge topic 'FindBLAS-OpenBLAS-thread' 
276b56f01c FindBLAS: Add second try for OpenBLAS with thread libraries.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3434
 2019-06-17 08:03:22 -04:00
Alexander Neumann
276b56f01c FindBLAS: Add second try for OpenBLAS with thread libraries. 
Issue: #16221
 2019-06-17 08:03:07 -04:00
Brad King
1af08229a7 Merge topic 'language-dependent-linker-flags' 
a982916304 Support per-language library link flags

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3429
 2019-06-12 12:45:15 -04:00
Brad King
445c7bc219 Merge topic 'CheckCXXSymbolExists-xref' 
f26c3d5c60 CheckCXXSymbolExists: reference to CheckCXXSourceCompiles instead of C version

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3437
 2019-06-12 11:50:16 -04:00
Rolf Eike Beer
f26c3d5c60 CheckCXXSymbolExists: reference to CheckCXXSourceCompiles instead of C version 2019-06-12 11:48:56 -04:00
Kyle Edwards
3092c27f30 CPack: Fix SONAME regex in DEB generator 
The DEB generator was written to parse output from GNU readelf.
However, LLVM's readelf has a slightly different output format,
without parentheses around the word "SONAME". Update the regex to
account for this difference.

Fixes: #19362
 2019-06-12 10:13:43 -04:00
Kyle Edwards
54ec4c1e79 GetPrerequisites: Add deprecation notice 
GetPrerequisites has now been superceded by file(GET_RUNTIME_DEPENDENCIES),
so add a deprecation notice stating such.
 2019-06-10 14:35:28 -04:00
Saleem Abdulrasool
a982916304 Support per-language library link flags 
This changes the behaviour of the generators to use a per-language
library search path flag.  This is needed for multi-language projects
with different compilers (e.g. cl + gfortran).  Since the adjusted
variable has been part of the user settings, we control this based on a
policy.

Fixes: #19307
 2019-06-06 15:28:43 -07:00
Brad King
baf3a84eff Merge topic 'cpack-nuget-case' 
8a4732c60e CPack/NuGet: Find nuget tool on case sensitive file system

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Mathieu Malaterre <mathieu.malaterre@gmail.com>
Merge-request: !3427
 2019-06-06 10:32:10 -04:00
Mathieu Malaterre
8a4732c60e CPack/NuGet: Find nuget tool on case sensitive file system 
There is no need to use a CamelCase executable name since it will be
handled gracefully on Windows anyway.  This change allow support for
Linux system, in particular Debian distribution where the binary is
called `nuget`.
 2019-06-05 09:32:22 -04:00
Craig Scott
15de26c7f3 Help: Trivial typo and grammar fixes for FindEnvModules 2019-06-05 20:55:18 +10:00
Ben Boeckel
0da2c35d6b GetPrerequisites: fix regression in gp_append_unique 
The `item` variable was the loop variable in the old code prior to
commit 3dfc8b9bd6 (GetPrerequisites: use if(IN_LIST) instead of foreach,
2019-05-09).  The function argument `value` should be used instead.
 2019-06-04 12:00:06 -04:00
Brad King
36140d864e Merge topic 'ninja-nvcc-rsp' 
d91b5a72cd Ninja: Add support for CUDA nvcc response files
5efac09bed Ninja: Compute linker response file flag earlier

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3399
 2019-06-04 08:35:47 -04:00
Brad King
d4108f5585 Merge topic 'check_language_respects_cuda_host_compiler' 
fada8cbfd6 CheckLanguage: Report CMAKE_CUDA_HOST_COMPILER if needed for compilation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3407
 2019-06-04 08:30:26 -04:00
Francisco Facioni
d91b5a72cd Ninja: Add support for CUDA nvcc response files 2019-06-03 11:53:27 -04:00
Robert Maynard
fada8cbfd6 CheckLanguage: Report CMAKE_CUDA_HOST_COMPILER if needed for compilation 
Fixes: #19013
 2019-06-03 10:36:06 -04:00
Marc Chevrier
52b298bd03 FindPython: ensure Python_ROOT_DIR is always searched first 2019-05-31 19:05:04 +02:00
Brad King
720253393c Merge topic 'ninja-cmcldeps' 
fd28e24947 Windows-MSVC.cmake: fix disabling of CMAKE_NINJA_CMCLDEPS_RC

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3404
 2019-05-31 09:10:51 -04:00
Brad King
d8e90be04d Merge topic 'FindPython-remove-erroneous-code' 
4a871d51a3 FindPython*: remove erroneous code

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3400
 2019-05-31 09:08:40 -04:00
Marc-André Moreau
fd28e24947 Windows-MSVC.cmake: fix disabling of CMAKE_NINJA_CMCLDEPS_RC 2019-05-30 13:11:34 -04:00
Brad King
7a8a24d028 Merge topic 'FindBoost-debug-messages' 
35bfc85d95 FindBoost: Refactor debug messages

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3382
 2019-05-30 10:41:14 -04:00
Marc Chevrier
4a871d51a3 FindPython*: remove erroneous code 2019-05-30 13:40:46 +02:00
Brad King
067a4f484b Merge topic 'clang-gnulike-support' 
74829f01b1 Help: Add notes for topic 'clang-gnulike-support'
19669abe1d Tests: handle string escaping differences with NMake+clang
a2a90f41e3 Tests: require C++14 for the Tutorial
4819ff9647 Tests: fix failures with gnu mode clang on windows
26af0b25e7 cmake: use correct stack size with gnu mode clang on windows
d44c0db0b2 clang: setup correct configuration in gnu mode
b7d5ef23e9 cmGlobalNinjaGenerator: use gnu compatible paths with clang in gnu mode
3d0210d8dc binutils: add the llvm-* variants to the tool lists.
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Francesco Bertolaccini <francesco@bertolaccini.dev>
Acked-by: Stanislav Ershov <digital.stream.of.mind@gmail.com>
Acked-by: Saleem Abdulrasool <compnerd@compnerd.org>
Merge-request: !2992
 2019-05-29 09:22:12 -04:00
Brad King
8b42d56002 Merge topic 'FindZLIB-names' 
4ff3ab2ac9 FindZLIB: Add more zlib library names

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3384
 2019-05-29 09:19:38 -04:00
Brad King
5a720a30fa Merge topic 'samu' 
a15595e4c9 Ninja: Consider 'samu' when looking for CMAKE_MAKE_PROGRAM

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3380
 2019-05-29 09:18:35 -04:00
Brad King
a1c291e0ac Merge topic 'swift-wrapper' 
6baa80d1e3 Modules: correct linker wrapper flag for Swift

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3390
 2019-05-29 09:17:44 -04:00
Brad King
f093ac36c0 Merge topic 'linker-preference' 
abea06efdf Modules: setup `CMAKE_Swift_LINKER_PREFERENCE`

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3373
 2019-05-29 09:16:17 -04:00
Brad King
0f9d7dc3ba Merge topic 'findopenmp-new-dates' 
26f2b65fec FindOpenMP: Add 5.0 and VS19 spec dates

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3375
 2019-05-29 09:15:09 -04:00