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,988 Commits 2 Branches 385 Tags
5affe415a3ca6852c1c43bc439129db56b63649f
Commit Graph

9511 Commits

Author SHA1 Message Date
Brian Carlson
5affe415a3 FindMPI: Add MPI_EXECUTABLE_SUFFIX to every item in lists 
Add the `${MPI_EXECUTABLE_SUFFIX}` to each of the items in the
`_MPI_${id}_${LANG}_COMPILER_NAMES` and `_MPI_${LANG}_GENERIC_COMPILER_NAMES` rather
than just adding the suffix to the last item in each list.
 2019-06-29 13:35:01 -04:00
Brad King
6ddc0b4438 Merge topic 'cuda-msvc-runtime-library' 
8fbd25772f CUDA: Implement MSVC runtime library abstraction
07807a2006 VS: Use AddLanguageFlags to de-duplicate CMAKE_{CUDA,ASM*}_FLAGS lookup

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3485
 2019-06-27 07:30:01 -04:00
Brad King
8fbd25772f CUDA: Implement MSVC runtime library abstraction 
In commit fb3370b6a1 (MSVC: Add abstraction for runtime library
selection, 2019-04-10, v3.15.0-rc1~229^2) we overlooked updating flags
for CUDA on Windows, where nvcc uses MSVC as the host compiler.  Add
them now and update the MSVCRuntimeLibrary test to cover CUDA.

Fixes: #19428
 2019-06-26 08:36:48 -04:00
Brad King
1e263065e1 Merge topic 'findmpi_use_interface_link_options' 
39c572c9c9 FindMPI: Updated to use INTERFACE_LINK_OPTIONS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3476
 2019-06-26 07:12:24 -04:00
Brad King
c92f5f6a73 Merge topic 'FindMatlab/issue-19279-mex-compilation-error-on-attribute' 
c2595a4958 FindMatlab: removing spaces in compiler define

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3473
 2019-06-26 07:11:34 -04:00
Rolf Eike Beer
e28240ea1f FindProtobuf: C++11 support is required since version 3.6.0 2019-06-25 15:22:01 +02:00
Raffi Enficiaud
c2595a4958 FindMatlab: removing spaces in compiler define 
Spaces in `DLL_EXPORT_SYM=__attribute__ ((visibility (\"default\")))`
are causing a compilation error.

Fixes: #19279
 2019-06-25 07:24:01 -04:00
Brad King
1009fd1860 Merge topic 'matlab-if' 
56e89e50d3 FindMatlab: simplify several if()-constructs
51bcdeb17f Tests: simplify checks for Matlab variables being set

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3472
 2019-06-25 07:15:33 -04:00
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
Robert Maynard
39c572c9c9 FindMPI: Updated to use INTERFACE_LINK_OPTIONS 2019-06-24 16:45:44 -04:00
Rolf Eike Beer
56e89e50d3 FindMatlab: simplify several if()-constructs 2019-06-24 18:33:48 +02: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
Brad King
00ad0b9d12 Merge branch 'android-pie-cmp0083' into release-3.15 
Merge-request: !3459
 2019-06-19 08:20:35 -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
1ca4be5d90 Merge branch 'FindMPI-imported-link-flags' into release-3.15 
Merge-request: !3449
 2019-06-19 07:26:22 -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
Brad King
65fc109dc6 Merge branch 'FindBoost-component' into release-3.15 
Merge-request: !3438
 2019-06-18 08:37:52 -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
dad271e8b7 Merge branch 'FindBLAS-OpenBLAS-thread' into release-3.15 
Merge-request: !3434
 2019-06-17 08:03:29 -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
069e42f7c3 Merge branch 'CheckCXXSymbolExists-xref' into release-3.15 
Merge-request: !3437
 2019-06-12 11:50:33 -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
Brad King
501a3cf195 Merge branch 'cpack-nuget-case' into release-3.15 
Merge-request: !3427
 2019-06-05 09:58:41 -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