summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | FindPostgreSQL: Fix regression in computation of library directoryBrad King2019-07-021-1/+8
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | Merge topic 'doc-toolchain-file-CMAKE_SOURCE_DIR' into release-3.15Craig Scott2019-07-031-0/+8
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | Merge-request: !3495
| * | | | | Help: Discourage using CMAKE_SOURCE_DIR in toolchain filesOleg Chernovskiy2019-07-021-0/+8
|/ / / / / | | | | | | | | | | | | | | | Fixes: #19390
* | | | | Merge branch 'qt-5.13' into release-3.15Brad King2019-07-012-5/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !3500
| * | | | | QtDialog: Use QPalette::WindowText instead of QPalette::ForegroundSebastian Holtermann2019-07-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `QPalette::Foreground` is deprecated and was replaced by `QPalette::WindowText` since at least Qt 4.8. https://doc.qt.io/archives/qt-4.8/qpalette.html#ColorRole-enum This replaces the `QPalette::Foreground` color role with `QPalette::WindowText` in `QtDialog/RegexExplorer.cxx` to avoid compiler warnings.
| * | | | | Tests: Autogen: Use valid rcc compression levelsSebastian Holtermann2019-07-011-4/+4
| |/ / / / | | | | | | | | | | | | | | | | | | | | Avoid the invalid compression level 0 when invoking rcc. It let's rcc fail with an error since Qt 5.13.
* | | | | Merge branch 'update-expat' into release-3.15Brad King2019-07-0124-1570/+2056
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !3501
| * \ \ \ \ Merge branch 'upstream-expat' into update-expatBrad King2019-07-0123-1569/+2055
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream-expat: expat 2019-06-19 (d3b78b42)
| | * | | | | expat 2019-06-19 (d3b78b42)Expat Upstream2019-07-0123-1569/+2055
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://github.com/libexpat/libexpat.git at commit d3b78b42a2dcdea98e22625cfff67a49d47e6025 (R_2_2_7).
| * | | | | | expat: Update script to get Expat 2.2.7Brad King2019-07-011-1/+1
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'cuda-no-device-link-when-disabled' into release-3.15Brad King2019-07-018-11/+38
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !3491
| * | | | | | CUDA: Do not device link if CUDA is not an enabled languageRobert Maynard2019-07-018-11/+38
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Checks added in commit 81b4d10d8f (CUDA: More exhaustive checks to determine when to do device linking, 2019-05-09, v3.15.0-rc1~82^2) assumed that CUDA properties would be set only if CUDA is enabled. We cannot do a device link step if we do not have the CUDA language enabled. This was discovered as some projects unconditionally set CUDA properties such as `CUDA_RESOLVE_DEVICE_SYMBOLS` even when the CUDA language has not been enabled. Fixes: #19432
* | | | | | Merge branch 'docs-project-code-injection' into release-3.15Craig Scott2019-07-011-13/+18
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !3494
| * | | | | | Help: move code injection vars to their own sectionCraig Scott2019-06-301-8/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The docs for CMAKE_PROJECT_<projName>_INCLUDE and CMAKE_PROJECT_INCLUDE did not define the order of inclusion if both were set.
| * | | | | | Help: Remove self-references from project() docsCraig Scott2019-06-291-5/+5
| |/ / / / /
* | | | | | Merge branch 'bug/19436' into release-3.15Craig Scott2019-07-012-1/+14
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | Merge-request: !3497
| * | | | | list(POP_FRONT): Fix always assigning first item to output varsAlex Turbov2019-06-302-1/+14
|/ / / / / | | | | | | | | | | | | | | | Fixes: #19436
* | | | | 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