summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* CMake 3.15.0-rc4v3.15.0-rc4Brad King2019-07-101-1/+1
|
* Merge branch 'cuda-imported-library-device-linking' into release-3.15Brad King2019-07-101-6/+11
|\ | | | | | | Merge-request: !3526
| * CUDA: Restore device linking to imported static library targetsRobert Maynard2019-07-091-6/+11
| | | | | | | | | | | | | | This ability was lost in commit 81b4d10d8f (CUDA: More exhaustive checks to determine when to do device linking, 2019-05-09, v3.15.0-rc1~82^2) and needs to be restored to use imported static libraries that have CUDA symbols.
* | Merge branch 'ccmake-clear-aliases' into release-3.15Brad King2019-07-091-0/+1
|\ \ | | | | | | | | | Merge-request: !3529
| * | cmGlobalGenerator: Do not persist alias targets across configuresBrad King2019-07-081-0/+1
| |/ | | | | | | | | | | | | | | | | In `ccmake` a single global generator instance may be used for multiple configure step runs. The `cmGlobalGenerator::ClearGeneratorMembers` method is supposed to clear global state that is specific to each configure run but forgot to clear alias targets. Fixes: #19457
* | Merge branch 'loglevel-option-case-consistency' into release-3.15Craig Scott2019-07-091-1/+1
|\ \ | | | | | | | | | Merge-request: !3521
| * | Help: Use consistent levels for cmake --loglevel and message()Craig Scott2019-07-081-1/+1
| |/ | | | | | | | | | | | | | | | | | | The message() command requires uppercase log levels. Even though the cmake --loglevel option is not case sensitive, show the supported values as uppercase to match the message() docs as closely as possible, since they are related to the same feature. Also fixes the wrong string being shown for the warning level by cmake --help.
* | Merge branch 'qt-5.13' into release-3.15Brad King2019-07-011-1/+1
|\ \ | | | | | | | | | 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.
* | Merge branch 'cuda-no-device-link-when-disabled' into release-3.15Brad King2019-07-014-11/+9
|\ \ | | | | | | | | | Merge-request: !3491
| * | CUDA: Do not device link if CUDA is not an enabled languageRobert Maynard2019-07-014-11/+9
| |/ | | | | | | | | | | | | | | | | | | | | | | | | 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
* | list(POP_FRONT): Fix always assigning first item to output varsAlex Turbov2019-06-301-1/+1
|/ | | | 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-261-15/+11
|\ | | | | | | Merge-request: !3485
| * 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 'export-targets-empty' into release-3.15Brad King2019-06-261-2/+9
|\ \ | | | | | | | | | Merge-request: !3484
| * | export: Restore support for empty TARGETS listBrad King2019-06-251-2/+9
| |/ | | | | | | | | | | | | | | | | 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
* | 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.
* CMake 3.15.0-rc2v3.15.0-rc2Brad King2019-06-191-1/+1
|
* Merge branch 'find_package_prefer_config_fix' into release-3.15Brad King2019-06-172-5/+24
|\ | | | | | | Merge-request: !3446
| * find_package: Fixed CMAKE_FIND_PACKAGE_PREFER_CONFIG Module fallbackCristian Adam2019-06-132-5/+24
| | | | | | | | 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 'capabilities-fileapi' into release-3.15Brad King2019-06-126-26/+63
|\ \ \ | | |/ | |/| | | | Merge-request: !3433
| * | cmake: Teach -E capabilities to report supported fileapi requestsBrad King2019-06-073-0/+36
| | | | | | | | | | | | 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
| |/
* | Autogen: Fix header detection for paths with symbolic linksSebastian Holtermann2019-06-061-3/+3
|/ | | | | | | | | | | | | | When Autogen searches the header for a source files in a target, the expanded real path is used and not the (possibly symbolic) original path of the source file. If the source file path contains symbolic links, then the correct `cmSourceFile` instance of the header won't be found, but a new one will be generated. This way all header source file properties get lost, which is problematic especially for the `SKIP_AUTOMOC/UIC/GEN` properties. This patch changes the header detection in Autogen to use the original source file path instead of the expanded real source file path. Fixes: #19346
* CMake 3.15.0-rc1 version updateBrad King2019-06-041-3/+3
|
* Merge topic 'emulator-arguments'Brad King2019-06-042-13/+48
|\ | | | | | | | | | | | | fec441ec17 Teach CROSSCOMPILING_EMULATOR to support arguments Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3402
| * Teach CROSSCOMPILING_EMULATOR to support argumentsMarek Antoniak2019-06-032-13/+48
| | | | | | | | Fixes: #19321
* | Merge topic 'remove_directories'Brad King2019-06-041-8/+12
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 07a80c7002 cmake: Teach -E remove_directory to remove multiple directories 013bee698e Tests: Add RunCMake.CommandLine make_directory test checks 3eb16de327 Tests: Fix RunCMake.CommandLine make_directory test name Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3411
| * | cmake: Teach -E remove_directory to remove multiple directoriesJohn Freeman2019-06-031-8/+12
| | | | | | | | | | | | | | | The `make_directory` command can make multiple directories in a single invocation. Make `remove_directory` mirror that behavior.
* | | Merge topic 'ninja-nvcc-rsp'Brad King2019-06-042-29/+52
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Ninja: Add support for CUDA nvcc response filesFrancisco Facioni2019-06-032-9/+26
| | | |
| * | | Ninja: Compute linker response file flag earlierFrancisco Facioni2019-06-031-22/+28
| | | |
* | | | Merge topic 'executables-are-consoled'Brad King2019-06-042-0/+36
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b06f4c8a74 Swift: disallow WIN32_EXECUTABLE properties Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3410
| * | | | Swift: disallow WIN32_EXECUTABLE propertiesSaleem Abdulrasool2019-06-032-0/+36
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, the compiler does not synthesize the correct entry point for the application and passing the subsystem flag does not work the same way with the Swift linker language. Add a check to prevent the application of `WIN32_EXECUTABLE` to Swift executables until they can be properly supported. This will prevent the need for a future policy change. Closes: #19325
* | | | Merge topic 'swift-linker-flags'Brad King2019-06-041-49/+62
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7456739e24 Swift: avoid `CMAKE_{EXE,SHARED}_LINKER_FLAGS` Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3406
| * | | | Swift: avoid `CMAKE_{EXE,SHARED}_LINKER_FLAGS`Saleem Abdulrasool2019-06-031-49/+62
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid the use of `CMAKE_{EXE,SHARED}_LINKER_FLAGS` when linking with the Swift language. This required hoisting the executable flags of `CMAKE_CREATE_WIN32_EXE`, `CMAKE_CREATE_CONSOLE_EXE`, and `CMAKE_EXE_EXPORTS_*_FLAG` earlier to avoid a second clause which checks the language. This allows for mixed-language Swift projects to properly link on Windows. Fixes #19298
* | | | Merge topic 'compiler_id_gen_exp_supports_multiple_ids'Brad King2019-06-043-36/+54
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 162555d7ec Help: Add release notes for updated generator expressions 808b818063 Genex: CompileLang and CompileLangAndId now match against a list of ids 9fd602bfd3 Genex: PlatformId now can match against a list of ids. ec66af2026 Genex: CompilerId now can match against a list of ids. 2d4787fc4d Genex: Add more extensive support for an unbounded number of parameters Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3405
| * | | | Genex: CompileLang and CompileLangAndId now match against a list of idsRobert Maynard2019-06-031-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows for expressions such as: $<COMPILE_LANG_AND_ID, CXX, GNU, Clang>
| * | | | Genex: PlatformId now can match against a list of ids.Robert Maynard2019-06-031-3/+5
| | | | |
| * | | | Genex: CompilerId now can match against a list of ids.Robert Maynard2019-06-031-25/+28
| | | | | | | | | | | | | | | | | | | | | | | | | This allows for expressions like: $<$<CXX_COMPILER_ID:Clang,GNU>:-DMY_PRIVATE_DEFINE>
| * | | | Genex: Add more extensive support for an unbounded number of parametersRobert Maynard2019-06-032-4/+10
| |/ / / | | | | | | | | | | | | | | | | | | | | Previously genex support for unbounded number of parameters required at least 1 parameter. We now support zero or more parameters, and two or more parameters.
* | | | Merge topic 'print-correct-line-number'Brad King2019-06-041-5/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3475e2728b cmListFileCache: When missing ending ) print starting line instead of last one Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3398
| * | | | cmListFileCache: When missing ending ) print starting line instead of last oneBartosz Kosiorek2019-06-031-5/+2
| | | | | | | | | | | | | | | | | | | | Fixes: #19301
* | | | | Merge topic 'better_error_message_for_visibility_preset_property'Brad King2019-06-041-1/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 619416f8a3 The error message for VISIBILITY_PRESET now documents valid options. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3409