mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-30 11:08:51 -06:00
Code Issues Packages Projects Releases Wiki Activity
43,860 Commits 2 Branches 390 Tags
86ead0b5a32ee48907084a7cf85d00196cbf0366
Commit Graph

9483 Commits

Author SHA1 Message Date
Brad King
98844aaa6f Merge branch 'implicit-includes-cray-hlist' into release-3.15 
Merge-request: !3532
 2019-07-10 08:57:55 -04:00
Brad King
0a7b61269c Merge branch 'backport-implicit-includes-cray-hlist' 2019-07-09 13:13:26 -04:00
Chuck Atkins
98e371f13e Cray: Fix include parsing when the -hlist= flag is present 
Update parsing logic from commit 5990ecb741 (Compute implicit include
directories from compiler output, 2018-12-07, v3.14.0-rc1~108^2)
to handle the quoting behavior caused by the `-hlist=` flag.
 2019-07-09 13:12:52 -04:00
Brad King
dd1257e2de Merge branch 'iar-riscv' into release-3.15 
Merge-request: !3510
 2019-07-09 09:34:42 -04:00
Stefan Andersson
c242187875 IAR: Add support for the RISC-V compiler 2019-07-08 13:11:45 -04:00
Brad King
d21b890a4c FindPostgreSQL: Fix regression in computation of library directory 
Since commit 368bcba28a (FindPostgreSQL: Find debug lib, imported
configs, 2019-05-09, v3.15.0-rc1~93^2) the `PostgreSQL_LIBRARY` variable
may contain a list and therefore should not be passed to the
`get_filename_component` command directly.  Instead spell out the logic
to compute `PostgreSQL_LIBRARY_DIR` from one of the per-configuration
variables.

Fixes: #19444
 2019-07-02 07:32:14 -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
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
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
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
dad271e8b7 Merge branch 'FindBLAS-OpenBLAS-thread' into release-3.15 
Merge-request: !3434
 2019-06-17 08:03:29 -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
069e42f7c3 Merge branch 'CheckCXXSymbolExists-xref' into release-3.15 
Merge-request: !3437
 2019-06-12 11:50:33 -04:00
Rolf Eike Beer
f26c3d5c60 CheckCXXSymbolExists: reference to CheckCXXSourceCompiles instead of C version 2019-06-12 11:48:56 -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
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
Brad King
c7db6ce986 Merge topic 'flex' 
a7754448f6 FindFLEX: fix example

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3379
 2019-05-28 14:59:48 -04:00
Alexander Neumann
4ff3ab2ac9 FindZLIB: Add more zlib library names 
Account for all names that can be generated by the upstream zlib build
system.

Issue: #18029
 2019-05-28 14:51:45 -04:00
Dennis Klein
35bfc85d95 FindBoost: Refactor debug messages 
* Deduplicate code with helper functions
* Remove double printing of _boost_TEST_VERSIONS
* Fix #19158
* Add printing of a few additional variables
 2019-05-28 20:46:43 +02:00
Michael Forney
a15595e4c9 Ninja: Consider 'samu' when looking for CMAKE_MAKE_PROGRAM 
`samurai` is an alternative implementation of ninja and is a drop-in
replacement.  `samu --version` reports the ninja version it is
compatible with.
 2019-05-28 14:16:29 -04:00
Saleem Abdulrasool
6baa80d1e3 Modules: correct linker wrapper flag for Swift 
This was sitting locally but was missed in previous commits.  This
enables the use of `LINKER:` when building Swift code bases.
 2019-05-28 09:21:41 -07:00
Brad King
dfd2e0a4ed Merge topic 'FindThreads-doc-c++' 
a38b63c1bb FindThreads: Drop incorrect docs about usage with C++

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3391
 2019-05-28 11:58:07 -04:00
Brad King
f326591c13 Merge topic 'FindPython-find_framework' 
62d6ed79fb FindPython: Add variable 'Python_FIND_FRAMEWORK' to control frameworks lookup.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3374
 2019-05-28 11:53:21 -04:00
Brad King
76cb43c7c5 Merge topic 'GetPrerequisites-use-if-IN_LIST' 
3dfc8b9bd6 GetPrerequisites: use if(IN_LIST) instead of foreach

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3299
 2019-05-28 11:51:58 -04:00
Brad King
da0937c04f Merge topic 'swift-response' 
9e5457d3b4 Ninja,Swift: correct response file handling

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3367
 2019-05-28 11:50:28 -04:00
Brad King
56fec2fe8f Merge topic 'FindICU-find-names' 
59c392b44e FindICU: Pass explicit NAMES argument to find command calls

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3371
 2019-05-28 11:49:17 -04:00
Brad King
540640fc0a Merge topic 'FindBoost-contract-requires-compile-features' 
b915a42585 FindBoost: Add compiler features for Boost Contract library

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3368
 2019-05-28 11:42:12 -04:00
Brad King
f07d42632b Merge branch 'FindThreads-doc-c++' into release-3.14 
Merge-request: !3391
 2019-05-28 11:39:39 -04:00