mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-23 14:48:19 -05:00
Code Issues Packages Projects Releases Wiki Activity
43,986 Commits 2 Branches 401 Tags
d3ebef4f708f92cd348232d8629c918a6057e521
Commit Graph

43986 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Maynard d3ebef4f70 CMAKE_CUDA_HOST_COMPILER: Document it takes priority over CUDAHOSTCXX 2019-06-27 14:39:24 -04:00
Brad King 3327fe948e Merge topic 'vs-dpi-aware' 
cd92f8f8bf VS: Add VS_DPI_AWARE target property

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3418
 2019-06-27 08:56:41 -04:00
Brad King 50b2e74396 Merge branch 'release-3.15' 2019-06-27 08:39:09 -04:00
Brad King 753373579e CMake 3.15.0-rc3 v3.15.0-rc3 2019-06-27 07:35:14 -04:00
Brad King 79d27c06bc Merge branch 'release-3.15' 2019-06-27 07:31:25 -04:00
Brad King 6ddc0b4438 Merge topic 'cuda-msvc-runtime-library' 
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
 2019-06-27 07:30:01 -04:00
Kitware Robot 454a6250ca CMake Nightly Date Stamp 2019-06-27 00:01:06 -04:00
Matt Weir cd92f8f8bf VS: Add VS_DPI_AWARE target property 
Enables setting the visual studio project property for Manifests,
controlling the DPI Aware setting.
 2019-06-26 09:55:49 -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 06f1560a58 Merge topic 'build-install-rpath-genex' 
d29ed8a114 BUILD_RPATH/INSTALL_RPATH: Add generator expression support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3481
 2019-06-26 07:14:04 -04:00
Brad King 9b68e4b183 Merge topic 'implicit-includes-realpath' 
d88b38d05d Normalize paths when checking for implicit include dirs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3467
 2019-06-26 07:13:24 -04:00
Brad King 1e263065e1 Merge topic 'findmpi_use_interface_link_options' 
39c572c9c9 FindMPI: Updated to use INTERFACE_LINK_OPTIONS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3476
 2019-06-26 07:12:24 -04:00
Brad King c92f5f6a73 Merge topic 'FindMatlab/issue-19279-mex-compilation-error-on-attribute' 
c2595a4958 FindMatlab: removing spaces in compiler define

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3473
 2019-06-26 07:11:34 -04:00
Brad King d770b95212 Merge topic 'protobuf-c++11' 
e28240ea1f FindProtobuf: C++11 support is required since version 3.6.0

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3470
 2019-06-26 07:10:43 -04:00
Brad King 119643f630 Merge topic 'find-testlist' 
f68492912c Tests: reduce code duplication for CMake_TEST_Find*

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3471
 2019-06-26 07:09:34 -04:00
Brad King 2919f65c24 Merge topic 'fix-xcode6-compilation' 
1ff1f75718 Fix Xcode 6.1.1 compilation issue

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3480
 2019-06-26 07:08:36 -04:00
Brad King b39d240f5d Merge branch 'release-3.15' 2019-06-26 07:06:30 -04:00
Brad King 30eee7702f Merge topic 'export-targets-empty' 
2ba5c37b3f export: Restore support for empty TARGETS list

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3484
 2019-06-26 07:03:25 -04:00
Brad King c864765496 Merge topic 'ninja-nvcc-rsp' 
eda4c43879 Ninja: Fix CUDA device linking when using response files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3482
 2019-06-26 07:02:11 -04:00
Brad King b51b6cc572 Merge topic 'iconv-c++11' 
736f38ff34 FindIconv test: request C++11

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3469
 2019-06-26 07:00:41 -04:00
Brad King d7d282cd89 Merge topic 'doc-CMAKE_FRAMEWORK-crossref' 
f57a53d43e Help: Document that CMAKE_FRAMEWORK initializes FRAMEWORK target prop

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3478
 2019-06-26 06:59:33 -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
Kitware Robot b598c64954 CMake Nightly Date Stamp 2019-06-26 00:01:07 -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
Raffi Enficiaud 1ff1f75718 Fix Xcode 6.1.1 compilation issue 2019-06-25 17:34:56 +02:00
Kyle Edwards d2ac3e3e59 Merge topic 'fix-cmp0095-notes' 
dc764bd80d Help: Move CMP0095 into CMake 3.16 section

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3479
 2019-06-25 11:02:13 -04:00
Kyle Edwards d29ed8a114 BUILD_RPATH/INSTALL_RPATH: Add generator expression support 
Fixes: #19423
 2019-06-25 10:55:03 -04:00
Kyle Edwards dc764bd80d Help: Move CMP0095 into CMake 3.16 section 
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.
 2019-06-25 09:56:20 -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 e28240ea1f FindProtobuf: C++11 support is required since version 3.6.0 2019-06-25 15:22:01 +02: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
Raffi Enficiaud c2595a4958 FindMatlab: removing spaces in compiler define 
Spaces in `DLL_EXPORT_SYM=__attribute__ ((visibility (\"default\")))`
are causing a compilation error.

Fixes: #19279
 2019-06-25 07:24:01 -04:00
Brad King 1009fd1860 Merge topic 'matlab-if' 
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
 2019-06-25 07:15:33 -04:00
Brad King dba8086f58 Merge topic 'refactor/use-unique_ptr' 
5e52de7d57 modermize: replace some raw pointers w/ `unique_ptr`

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3465
 2019-06-25 07:13:38 -04:00
Brad King 92351fe7cd Merge topic 'find_matlab_exact' 
2454fe84f5 FindMatlab: Support EXACT versions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Raffi Enficiaud <raffi.enficiaud@free.fr>
Merge-request: !3460
 2019-06-25 07:07:29 -04:00
Brad King b4a882cf10 Merge topic 'FindPython-FIND_ABI' 
9201908ca5 FindPython: add Python_FIND_ABI hint.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3463
 2019-06-25 07:06:35 -04:00
Brad King 2e8b8eb857 Merge topic 'help-guide-tutorial' 
8ab8563533 Help: Add tutorial guide table of contents
0a6c9c417a Help: Update tutorial to include text from CMake book
eef3e020c2 Help: Populate tutorial guide text
862cfc0e6c Help/guide/tutorial: Adopt tutorial code
d2fde94809 Help: Add infrastructure for guide-level documentation
f067af8e38 Tests/Tutorial: Remove trailing blank lines
d5a81ef747 Tests/Tutorial: Remove unused file

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3439
 2019-06-25 07:05:35 -04:00
Kitware Robot edf232dbe4 CMake Nightly Date Stamp 2019-06-25 00:01:07 -04:00
Robert Maynard 39c572c9c9 FindMPI: Updated to use INTERFACE_LINK_OPTIONS 2019-06-24 16:45:44 -04:00
Rolf Eike Beer 56e89e50d3 FindMatlab: simplify several if()-constructs 2019-06-24 18:33:48 +02:00
Rolf Eike Beer 51bcdeb17f Tests: simplify checks for Matlab variables being set 2019-06-24 18:33:43 +02:00
Rolf Eike Beer f68492912c Tests: reduce code duplication for CMake_TEST_Find* 2019-06-24 18:31:53 +02:00
Brad King 5835f553be Merge branch 'release-3.15' 2019-06-24 09:44:46 -04: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