summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* CMake 3.15.0-rc3v3.15.0-rc3Brad King2019-06-271-1/+1
|
* Merge branch 'cuda-msvc-runtime-library' into release-3.15Brad King2019-06-265-19/+39
|\ | | | | | | Merge-request: !3485
| * CUDA: Implement MSVC runtime library abstractionBrad King2019-06-264-4/+28
| | | | | | | | | | | | | | | | | | 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
| * VS: Use AddLanguageFlags to de-duplicate CMAKE_{CUDA,ASM*}_FLAGS lookupBrad King2019-06-261-15/+11
| | | | | | | | | | | | | | | | 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.
* | Merge branch 'doc-CMAKE_FRAMEWORK-crossref' into release-3.15Brad King2019-06-261-1/+3
|\ \ | | | | | | | | | Merge-request: !3478
| * | Help: Document that CMAKE_FRAMEWORK initializes FRAMEWORK target propCraig Scott2019-06-251-1/+3
| |/
* | Merge branch 'export-targets-empty' into release-3.15Brad King2019-06-263-2/+11
|\ \ | | | | | | | | | Merge-request: !3484
| * | export: Restore support for empty TARGETS listBrad King2019-06-253-2/+11
| |/ | | | | | | | | | | | | | | | | 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
* | Merge branch 'ninja-nvcc-rsp' into release-3.15Brad King2019-06-251-13/+2
|\ \ | | | | | | | | | Merge-request: !3482
| * | Ninja: Fix CUDA device linking when using response filesFrancisco Facioni2019-06-251-13/+2
| |/ | | | | | | | | | | 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.
* | Merge branch 'iconv-c++11' into release-3.15Brad King2019-06-251-0/+2
|\ \ | | | | | | | | | Merge-request: !3469
| * | FindIconv test: request C++11Rolf Eike Beer2019-06-251-0/+2
|/ /
* | Merge branch 'doc-typos-cmake_parse_arguments' into release-3.15Brad King2019-06-241-8/+8
|\ \ | | | | | | | | | Merge-request: !3468
| * | Help: Typo and grammar fixes in cmake_parse_arguments() docsCraig Scott2019-06-231-8/+8
| |/
* | Merge branch 'doc-IMPORTED_LOCATION' into release-3.15Brad King2019-06-211-4/+11
|\ \ | | | | | | | | | Merge-request: !3466
| * | Help: Improve documentation of IMPORTED_LOCATION propertyAlexandru Croitor2019-06-211-4/+11
| |/ | | | | | | | | | | | | | | 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>
* | Merge branch 'autogen_documentation' into release-3.15Brad King2019-06-193-106/+306
|\ \ | |/ |/| | | Merge-request: !3461
| * Help: Autogen: Overhaul AUTOMOC target property documentationSebastian Holtermann2019-06-191-62/+212
| | | | | | | | | | | | | | - Rewrites and restructures the AUTOMOC target property documentation - Remove the reference to the deprecated CMAKE_AUTOMOC_RELAXED_MODE Fixes: #19167
| * Help: Autogen: Overhaul AUTOUIC target property documentationSebastian Holtermann2019-06-191-26/+61
| |
| * Help: Autogen: Overhaul AUTORCC target property documentationSebastian Holtermann2019-06-191-18/+33
|/
* CMake 3.15.0-rc2v3.15.0-rc2Brad King2019-06-191-1/+1
|
* Merge branch 'android-pie-cmp0083' into release-3.15Brad King2019-06-192-0/+26
|\ | | | | | | Merge-request: !3459
| * Android: ensure PIE behavior is consistent regardless CMP0083 policyMarc Chevrier2019-06-192-0/+26
| | | | | | | | | | | | | | | | | | 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
* | Merge branch 'FindMPI-imported-link-flags' into release-3.15Brad King2019-06-191-1/+3
|\ \ | | | | | | | | | Merge-request: !3449
| * | FindMPI: Store imported target link flags as a list instead of a stringRobert Maynard2019-06-191-1/+3
| | | | | | | | | | | | | | | | | | | | | We already use the `separate_arguments` `NATIVE_COMMAND` mode to parse command-line strings into lists in several other places. Fixes: #18897
* | | Merge branch 'FindBoost-component' into release-3.15Brad King2019-06-1828-5/+576
|\ \ \ | | | | | | | | | | | | Merge-request: !3438
| * | | FindBoost: Add tests for legacy variablesAlexander Grund2019-06-1825-0/+415
| | | |
| * | | FindBoost: Add legacy variables and targets for compatibilityAlexander Grund2019-06-181-0/+150
| | | | | | | | | | | | | | | | | | | | This allows future BoostConfig to NOT define those and users relying on them use the newer FindBoost of newer CMake versions
| * | | FindBoost: Don't overwrite Boost_${_comp}_FOUNDAlexander Grund2019-06-181-5/+7
| | | | | | | | | | | | | | | | Is set in Boost >= 1.71 so don't overwrite it
| * | | Tests.RunCMake.FindBoost: Fix example BoostConfigAlexander Grund2019-06-181-0/+3
| | | |
| * | | Tests.FindBoost: Don't use BoostConfig in MODULE testAlexander Grund2019-06-181-0/+1
| |/ /
* | | Merge branch 'doc-project-include' into release-3.15Brad King2019-06-183-9/+19
|\ \ \ | | | | | | | | | | | | Merge-request: !3453
| * | | Help: Document what project() calls use CMAKE_PROJECT_INCLUDE and friendsBrad King2019-06-173-9/+19
| |/ / | | | | | | | | | Fixes: #19340
* | | Merge branch 'FindBLAS-OpenBLAS-thread' into release-3.15Brad King2019-06-171-1/+15
|\ \ \ | | | | | | | | | | | | Merge-request: !3434
| * | | FindBLAS: Add second try for OpenBLAS with thread libraries.Alexander Neumann2019-06-171-1/+15
| |/ / | | | | | | | | | Issue: #16221
* | | Merge branch 'find_package_prefer_config_fix' into release-3.15Brad King2019-06-174-5/+38
|\ \ \ | | | | | | | | | | | | Merge-request: !3446
| * | | find_package: Fixed CMAKE_FIND_PACKAGE_PREFER_CONFIG Module fallbackCristian Adam2019-06-134-5/+38
| |/ / | | | | | | | | | Fixes: #19361
* | | Merge branch 'capabilities-fileapi' into release-3.15Brad King2019-06-171-3/+3
|\ \ \ | | | | | | | | | | | | Merge-request: !3442
| * | | fileapi: Suppress lint warning about non-move with old jsoncppBrad King2019-06-121-3/+3
| | | |
* | | | Merge branch 'cmake-gui-qt-notice' into release-3.15Craig Scott2019-06-131-1/+1
|\ \ \ \ | | | | | | | | | | Merge-request: !3441
| * | | | cmake-gui: Update Qt copyright holder in About dialogBrad King2019-06-121-1/+1
| | |/ / | |/| | | | | | | | | | Qt is now copyright "The Qt Company Ltd.".
* | | | Merge branch 'CheckCXXSymbolExists-xref' into release-3.15Brad King2019-06-121-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | Merge-request: !3437
| * | | | CheckCXXSymbolExists: reference to CheckCXXSourceCompiles instead of C versionRolf Eike Beer2019-06-121-1/+1
| |/ / /
* | | | Merge branch 'capabilities-fileapi' into release-3.15Brad King2019-06-129-27/+82
|\ \ \ \ | | |/ / | |/| | | | | | Merge-request: !3433
| * | | cmake: Teach -E capabilities to report supported fileapi requestsBrad King2019-06-076-1/+55
| | | | | | | | | | | | | | | | Fixes: #19339
| * | | cmake: Simplify implementation of -E capabilitiesBrad King2019-06-074-12/+8
| | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | fileapi: Factor out helper to construct a version objectBrad King2019-06-072-14/+19
| |/ /
* | | Merge branch 'additional_clean_files_help' into release-3.15Craig Scott2019-06-083-11/+23
|\ \ \ | | | | | | | | | | | | Merge-request: !3428
| * | | Help: Improve ADDITIONAL_CLEAN_FILES documentationSebastian Holtermann2019-06-072-10/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend the `ADDITIONAL_CLEAN_FILES' target and directory property documentation. Fixes: #19341
| * | | Help: Move ADDITIONAL_MAKE_CLEAN_FILES dir prop to deprecated sectionCraig Scott2019-06-071-1/+1
| |/ /