mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-23 22:58:37 -05:00
Code Issues Packages Projects Releases Wiki Activity
43,822 Commits 2 Branches 401 Tags
753373579e3dd8cf19f0fc18f4d9bec43a2d82e8
Commit Graph

43822 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King 753373579e CMake 3.15.0-rc3 v3.15.0-rc3 2019-06-27 07:35:14 -04:00
Brad King d9a9150351 Merge branch 'cuda-msvc-runtime-library' into release-3.15 
Merge-request: !3485
 2019-06-26 08:43:19 -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 07807a2006 VS: Use AddLanguageFlags to de-duplicate CMAKE_{CUDA,ASM*}_FLAGS lookup 
Apply the refactoring from commit 707283981f (VS: Use AddLanguageFlags
to de-duplicate CMAKE_<LANG>_FLAGS* lookup, 2019-04-01,
v3.15.0-rc1~300^2) to the CUDA, ASM_MASM, and ASM_NASM languages too.
In particular, CUDA needs the MSVC runtime library selection logic
in the `AddLanguageFlags` method that is used by other generators.
 2019-06-26 08:36:48 -04:00
Brad King 2bbbc4ce1f Merge branch 'doc-CMAKE_FRAMEWORK-crossref' into release-3.15 
Merge-request: !3478
 2019-06-26 06:56:37 -04:00
Brad King edec1c2615 Merge branch 'export-targets-empty' into release-3.15 
Merge-request: !3484
 2019-06-26 06:53:40 -04:00
Brad King 2ba5c37b3f export: Restore support for empty TARGETS list 
Refactoring in commit f5acecaa6f (cmExportCommand: Port to
cmArgumentParser, 2019-03-23, v3.15.0-rc1~270^2~3) broke the `export`
command's support for specifying `TARGETS` with no entries.  Fix it and
add a test case.

Fixes: #19415
 2019-06-25 17:23:34 -04:00
Brad King 7113b94346 Merge branch 'ninja-nvcc-rsp' into release-3.15 
Merge-request: !3482
 2019-06-25 14:35:27 -04:00
Francisco Facioni eda4c43879 Ninja: Fix CUDA device linking when using response files 
Fix the logic added by commit d91b5a72cd (Ninja: Add support for CUDA
nvcc response files, 2019-05-30, v3.15.0-rc1~8^2) to always use the CUDA
compiler response file flag for response files during device linking.
 2019-06-25 14:30:36 -04:00
Brad King 9334a4b472 Merge branch 'iconv-c++11' into release-3.15 
Merge-request: !3469
 2019-06-25 09:27:56 -04:00
Rolf Eike Beer 736f38ff34 FindIconv test: request C++11 2019-06-25 15:14:02 +02:00
Craig Scott f57a53d43e Help: Document that CMAKE_FRAMEWORK initializes FRAMEWORK target prop 2019-06-25 21:57:31 +10:00
Brad King 154d25f5ba Merge branch 'doc-typos-cmake_parse_arguments' into release-3.15 
Merge-request: !3468
 2019-06-24 09:44:07 -04:00
Craig Scott 264612c013 Help: Typo and grammar fixes in cmake_parse_arguments() docs 2019-06-23 21:10:16 +10:00
Brad King 7dbd21fcf4 Merge branch 'doc-IMPORTED_LOCATION' into release-3.15 
Merge-request: !3466
 2019-06-21 12:00:44 -04:00
Alexandru Croitor 96c6bc2584 Help: Improve documentation of IMPORTED_LOCATION property 
Mention the usage of a configuration specific
`IMPORTED_LOCATION_<CONFIG>` value even if the `<CONFIG>` is not the
same as the active configuration of the currently built project.

Co-Author: Brad King <brad.king@kitware.com>
 2019-06-21 11:59:38 -04:00
Brad King 036752cc0e Merge branch 'autogen_documentation' into release-3.15 
Merge-request: !3461
 2019-06-19 10:43:43 -04:00
Sebastian Holtermann b55e5d6641 Help: Autogen: Overhaul AUTOMOC target property documentation 
- Rewrites and restructures the AUTOMOC target property documentation
- Remove the reference to the deprecated CMAKE_AUTOMOC_RELAXED_MODE

Fixes: #19167
 2019-06-19 10:40:42 -04:00
Sebastian Holtermann fdab21f30b Help: Autogen: Overhaul AUTOUIC target property documentation 2019-06-19 10:40:42 -04:00
Sebastian Holtermann d08548c624 Help: Autogen: Overhaul AUTORCC target property documentation 2019-06-19 10:40:42 -04:00
Brad King 5c7880956f CMake 3.15.0-rc2 v3.15.0-rc2 2019-06-19 08:33: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 830b332f32 FindBoost: Add tests for legacy variables 2019-06-18 08:33:36 -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
Alexander Grund 4cb652e1d3 Tests.RunCMake.FindBoost: Fix example BoostConfig 2019-06-18 08:24:42 -04:00
Alexander Grund 7251d54bd1 Tests.FindBoost: Don't use BoostConfig in MODULE test 2019-06-18 08:22:50 -04:00
Brad King e2b4fa1141 Merge branch 'doc-project-include' into release-3.15 
Merge-request: !3453
 2019-06-18 07:56:00 -04:00
Brad King 8a08d0c092 Help: Document what project() calls use CMAKE_PROJECT_INCLUDE and friends 
Fixes: #19340
 2019-06-17 11:06:07 -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 3d8216330d Merge branch 'find_package_prefer_config_fix' into release-3.15 
Merge-request: !3446
 2019-06-17 07:59:46 -04:00
Brad King e815fad43f Merge branch 'capabilities-fileapi' into release-3.15 
Merge-request: !3442
 2019-06-17 07:56:39 -04:00
Cristian Adam 22e65d10c1 find_package: Fixed CMAKE_FIND_PACKAGE_PREFER_CONFIG Module fallback 
Fixes: #19361
 2019-06-13 23:58:30 +02:00
Craig Scott 95b9d6af80 Merge branch 'cmake-gui-qt-notice' into release-3.15 
Merge-request: !3441
 2019-06-13 06:58:22 -04:00
Brad King d63398d32d fileapi: Suppress lint warning about non-move with old jsoncpp 2019-06-12 12:51:32 -04:00
Brad King c1d6b135ed cmake-gui: Update Qt copyright holder in About dialog 
Qt is now copyright "The Qt Company Ltd.".
 2019-06-12 12:39:25 -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 fa00a3b29b Merge branch 'capabilities-fileapi' into release-3.15 
Merge-request: !3433
 2019-06-12 11:42:44 -04:00
Craig Scott 8d3c919a3c Merge branch 'additional_clean_files_help' into release-3.15 
Merge-request: !3428
 2019-06-08 16:58:19 +10:00
Brad King 43316424d0 Merge branch 'autogen_header_in_symbolic_path_fix' into release-3.15 
Merge-request: !3431
 2019-06-07 11:16:04 -04:00
Brad King c932f49842 cmake: Teach -E capabilities to report supported fileapi requests 
Fixes: #19339
 2019-06-07 11:08:38 -04:00
Brad King 6696855f72 cmake: Simplify implementation of -E capabilities 
The `cmake -E capabilities` command-line tool is implemented only in a
full-featured (non-bootstrap) CMake, and server mode is now always
available in this case.
 2019-06-07 11:08:38 -04:00
Brad King 6b815e58ba fileapi: Factor out helper to construct a version object 2019-06-07 11:08:38 -04:00
Sebastian Holtermann e61074c672 Help: Improve ADDITIONAL_CLEAN_FILES documentation 
Extend the `ADDITIONAL_CLEAN_FILES' target and directory property
documentation.

Fixes: #19341
 2019-06-07 21:10:19 +10:00