summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix elseif() in place of else()Artalus2019-07-035-5/+5
|
* CMake Nightly Date StampKitware Robot2019-06-281-1/+1
|
* Merge topic 'vs-dpi-aware'Brad King2019-06-2710-8/+120
|\ | | | | | | | | | | | | cd92f8f8bf VS: Add VS_DPI_AWARE target property Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3418
| * VS: Add VS_DPI_AWARE target propertyMatt Weir2019-06-2610-8/+120
| | | | | | | | | | Enables setting the visual studio project property for Manifests, controlling the DPI Aware setting.
* | Merge branch 'release-3.15'Brad King2019-06-270-0/+0
|\ \
| * | CMake 3.15.0-rc3v3.15.0-rc3Brad King2019-06-271-1/+1
| | |
* | | Merge branch 'release-3.15'Brad King2019-06-270-0/+0
|\ \ \ | |/ /
| * | Merge branch 'cuda-msvc-runtime-library' into release-3.15Brad King2019-06-265-19/+39
| |\ \ | | | | | | | | | | | | Merge-request: !3485
* | \ \ Merge topic 'cuda-msvc-runtime-library'Brad King2019-06-275-19/+39
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | 8fbd25772f CUDA: Implement MSVC runtime library abstraction 07807a2006 VS: Use AddLanguageFlags to de-duplicate CMAKE_{CUDA,ASM*}_FLAGS lookup Acked-by: Kitware Robot <kwrobot@kitware.com> 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.
* | | | CMake Nightly Date StampKitware Robot2019-06-271-1/+1
| | | |
* | | | Merge topic 'build-install-rpath-genex'Brad King2019-06-269-31/+109
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d29ed8a114 BUILD_RPATH/INSTALL_RPATH: Add generator expression support Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3481
| * | | | BUILD_RPATH/INSTALL_RPATH: Add generator expression supportKyle Edwards2019-06-259-31/+109
| | | | | | | | | | | | | | | | | | | | Fixes: #19423
* | | | | Merge topic 'implicit-includes-realpath'Brad King2019-06-261-3/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d88b38d05d Normalize paths when checking for implicit include dirs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3467
| * | | | | Normalize paths when checking for implicit include dirsDaniel Scharrer2019-06-221-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GCC replaces implicit include directories with user-supplied ones if they point to the same directory, even if the path strings differ.
* | | | | | Merge topic 'findmpi_use_interface_link_options'Brad King2019-06-261-3/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 39c572c9c9 FindMPI: Updated to use INTERFACE_LINK_OPTIONS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3476
| * | | | | | FindMPI: Updated to use INTERFACE_LINK_OPTIONSRobert Maynard2019-06-241-3/+2
| | |_|/ / / | |/| | | |
* | | | | | Merge topic 'FindMatlab/issue-19279-mex-compilation-error-on-attribute'Brad King2019-06-261-3/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c2595a4958 FindMatlab: removing spaces in compiler define Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3473
| * | | | | | FindMatlab: removing spaces in compiler defineRaffi Enficiaud2019-06-251-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Spaces in `DLL_EXPORT_SYM=__attribute__ ((visibility (\"default\")))` are causing a compilation error. Fixes: #19279
* | | | | | | Merge topic 'protobuf-c++11'Brad King2019-06-261-0/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e28240ea1f FindProtobuf: C++11 support is required since version 3.6.0 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3470
| * | | | | | | FindProtobuf: C++11 support is required since version 3.6.0Rolf Eike Beer2019-06-251-0/+5
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge topic 'find-testlist'Brad King2019-06-261-167/+49
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f68492912c Tests: reduce code duplication for CMake_TEST_Find* Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3471
| * | | | | | | Tests: reduce code duplication for CMake_TEST_Find*Rolf Eike Beer2019-06-241-167/+49
| | |/ / / / / | |/| | | | |
* | | | | | | Merge topic 'fix-xcode6-compilation'Brad King2019-06-261-4/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1ff1f75718 Fix Xcode 6.1.1 compilation issue Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3480
| * | | | | | | Fix Xcode 6.1.1 compilation issueRaffi Enficiaud2019-06-251-4/+1
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'release-3.15'Brad King2019-06-260-0/+0
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Merge branch 'doc-CMAKE_FRAMEWORK-crossref' into release-3.15Brad King2019-06-261-1/+3
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !3478
| * \ \ \ \ \ \ Merge branch 'export-targets-empty' into release-3.15Brad King2019-06-263-2/+11
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !3484
| * \ \ \ \ \ \ \ Merge branch 'ninja-nvcc-rsp' into release-3.15Brad King2019-06-251-13/+2
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !3482
| * \ \ \ \ \ \ \ \ Merge branch 'iconv-c++11' into release-3.15Brad King2019-06-251-0/+2
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !3469
* | \ \ \ \ \ \ \ \ \ Merge topic 'export-targets-empty'Brad King2019-06-263-2/+11
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2ba5c37b3f export: Restore support for empty TARGETS list Acked-by: Kitware Robot <kwrobot@kitware.com> 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 topic 'ninja-nvcc-rsp'Brad King2019-06-261-13/+2
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | eda4c43879 Ninja: Fix CUDA device linking when using response files Acked-by: Kitware Robot <kwrobot@kitware.com> 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 topic 'iconv-c++11'Brad King2019-06-261-0/+2
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 736f38ff34 FindIconv test: request C++11 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3469
| * | | | | | | | FindIconv test: request C++11Rolf Eike Beer2019-06-251-0/+2
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge topic 'doc-CMAKE_FRAMEWORK-crossref'Brad King2019-06-261-1/+3
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f57a53d43e Help: Document that CMAKE_FRAMEWORK initializes FRAMEWORK target prop Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3478
| * | | | | | | Help: Document that CMAKE_FRAMEWORK initializes FRAMEWORK target propCraig Scott2019-06-251-1/+3
| | |/ / / / / | |/| | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2019-06-261-1/+1
| | | | | | |
* | | | | | | Merge topic 'fix-cmp0095-notes'Kyle Edwards2019-06-251-1/+8
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dc764bd80d Help: Move CMP0095 into CMake 3.16 section Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3479
| * | | | | | Help: Move CMP0095 into CMake 3.16 sectionKyle Edwards2019-06-251-1/+8
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CMP0095 was introduced in 3.16, but was mistakenly put in the notes for 3.15. This error was not caught during review. Move it into the notes for 3.16.
* | | | | | Merge topic 'matlab-if'Brad King2019-06-252-30/+30
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 56e89e50d3 FindMatlab: simplify several if()-constructs 51bcdeb17f Tests: simplify checks for Matlab variables being set Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3472
| * | | | | | FindMatlab: simplify several if()-constructsRolf Eike Beer2019-06-241-25/+25
| | | | | | |
| * | | | | | Tests: simplify checks for Matlab variables being setRolf Eike Beer2019-06-241-5/+5
| | |_|/ / / | |/| | | |
* | | | | | Merge topic 'refactor/use-unique_ptr'Brad King2019-06-2510-61/+42
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5e52de7d57 modermize: replace some raw pointers w/ `unique_ptr` Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3465
| * | | | | | modermize: replace some raw pointers w/ `unique_ptr`Alex Turbov2019-06-2410-61/+42
| | | | | | |
* | | | | | | Merge topic 'find_matlab_exact'Brad King2019-06-251-8/+22
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2454fe84f5 FindMatlab: Support EXACT versions Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Raffi Enficiaud <raffi.enficiaud@free.fr> Merge-request: !3460
| * | | | | | | FindMatlab: Support EXACT versionsStefan Lietzau2019-06-241-8/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If an exact version is requested, don't pick the latest matlab version but the one matching the requested version. Fixes: #19155
* | | | | | | | Merge topic 'FindPython-FIND_ABI'Brad King2019-06-257-100/+424
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9201908ca5 FindPython: add Python_FIND_ABI hint. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3463