mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-26 00:20:06 -06:00
Code Issues Packages Projects Releases Wiki Activity
44,016 Commits 2 Branches 386 Tags
021d147d26cb332f88e90d8a2dca9ff940942b7a
Commit Graph

44016 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King
021d147d26 Merge topic 'qt-5.13' 
963ddafeaa QtDialog: Use QPalette::WindowText instead of QPalette::Foreground
1a2d6bdefc Tests: Autogen: Use valid rcc compression levels

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3500
 2019-07-02 08:39:38 -04:00
Brad King
5d8dcdf5be Merge topic 'update-expat' 
0998f6396a Merge branch 'upstream-expat' into update-expat
ba13dc2aa8 expat 2019-06-19 (d3b78b42)
7449c63f3e expat: Update script to get Expat 2.2.7

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3501
 2019-07-02 08:38:24 -04:00
Brad King
41acd44625 Merge topic 'cuda-no-device-link-when-disabled' 
a4d502a5bf CUDA: Do not device link if CUDA is not an enabled language

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3491
 2019-07-02 08:36:56 -04:00
Marc Chevrier
554c2ed743 Merge topic 'FindMPI-AddSuffixes' 
5affe415a3 FindMPI: Add MPI_EXECUTABLE_SUFFIX to every item in lists

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3496
 2019-07-02 04:39:19 -04:00
Kitware Robot
9fad9b56f8 CMake Nightly Date Stamp 2019-07-02 00:01:08 -04:00
Brad King
fccc59c38c Merge topic 'remove_unneeded_variables_from_cmFindPackageCommand' 
96b10e47be Remove unused variables from cmFindPackageCommand

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3488
 2019-07-01 09:59:51 -04:00
Brad King
ecee33c3ae Merge topic 'override-rules-RC' 
d2f20ab217 RC: Honor CMAKE_USER_MAKE_RULES_OVERRIDE

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3489
 2019-07-01 09:54:19 -04:00
Brad King
dd433c98e4 Merge topic 'FindMatlab-EXCLUDE_FROM_ALL' 
11e0009b77 FindMatlab: EXCLUDE_FROM_ALL parameter to matlab_add_mex

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3474
 2019-07-01 09:52:44 -04:00
Brad King
0998f6396a Merge branch 'upstream-expat' into update-expat 
* upstream-expat:
  expat 2019-06-19 (d3b78b42)
 2019-07-01 09:42:12 -04:00
Expat Upstream
ba13dc2aa8 expat 2019-06-19 (d3b78b42) 
Code extracted from:

    https://github.com/libexpat/libexpat.git

at commit d3b78b42a2dcdea98e22625cfff67a49d47e6025 (R_2_2_7).
 2019-07-01 09:42:12 -04:00
Brad King
7449c63f3e expat: Update script to get Expat 2.2.7 2019-07-01 09:41:47 -04:00
Sebastian Holtermann
963ddafeaa QtDialog: Use QPalette::WindowText instead of QPalette::Foreground 
`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.
 2019-07-01 09:18:24 -04:00
Sebastian Holtermann
1a2d6bdefc Tests: Autogen: Use valid rcc compression levels 
Avoid the invalid compression level 0 when invoking rcc.
It let's rcc fail with an error since Qt 5.13.
 2019-07-01 09:18:24 -04:00
Robert Maynard
a4d502a5bf CUDA: Do not device link if CUDA is not an enabled language 
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
 2019-07-01 08:29:10 -04:00
Craig Scott
1892bf2d65 Merge branch 'release-3.15' 2019-07-01 21:56:20 +10:00
Craig Scott
3936e78bfe Merge branch 'docs-project-code-injection' into release-3.15 
Merge-request: !3494
 2019-07-01 21:55:06 +10:00
Craig Scott
419a5144b1 Merge branch 'release-3.15' 2019-07-01 21:51:27 +10:00
Craig Scott
32dae26975 Merge branch 'bug/19436' into release-3.15 
Merge-request: !3497
 2019-07-01 21:49:18 +10:00
Craig Scott
7ea18c02c3 Merge topic 'docs-project-code-injection' 
42294f43bd Help: move code injection vars to their own section
9e0775cb6a Help: Remove self-references from project() docs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3494
 2019-07-01 07:43:08 -04:00
Craig Scott
56f5310112 Merge topic 'bug/19436' 
822abf1265 list(POP_FRONT): Fix always assigning first item to output vars

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3497
 2019-07-01 07:42:04 -04:00
Kitware Robot
477a1ae478 CMake Nightly Date Stamp 2019-07-01 00:01:05 -04:00
Craig Scott
42294f43bd Help: move code injection vars to their own section 
The docs for CMAKE_PROJECT_<projName>_INCLUDE and
CMAKE_PROJECT_INCLUDE did not define the order of
inclusion if both were set.
 2019-07-01 08:01:49 +10:00
Alex Turbov
822abf1265 list(POP_FRONT): Fix always assigning first item to output vars 
Fixes: #19436
 2019-06-30 13:15:29 +03:00
Kitware Robot
dae77e069e CMake Nightly Date Stamp 2019-06-30 00:01:06 -04:00
Brian Carlson
5affe415a3 FindMPI: Add MPI_EXECUTABLE_SUFFIX to every item in lists 
Add the `${MPI_EXECUTABLE_SUFFIX}` to each of the items in the
`_MPI_${id}_${LANG}_COMPILER_NAMES` and `_MPI_${LANG}_GENERIC_COMPILER_NAMES` rather
than just adding the suffix to the last item in each list.
 2019-06-29 13:35:01 -04:00
Craig Scott
9e0775cb6a Help: Remove self-references from project() docs 2019-06-29 22:21:18 +10:00
Kitware Robot
2b1d9e51c2 CMake Nightly Date Stamp 2019-06-29 00:01:05 -04:00
Kitware Robot
3b90096838 CMake Nightly Date Stamp 2019-06-28 00:01:07 -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
d2f20ab217 RC: Honor CMAKE_USER_MAKE_RULES_OVERRIDE 
Since the refactoring in commit 48f7e2d300 (Unhardcode the
CMAKE_CONFIGURATION_TYPES values, 2017-11-27, v3.11.0-rc1~130^2~1),
`CMAKE_BUILD_TYPE` is initialized while enabling the RC language.
Therefore we need to honor `CMAKE_USER_MAKE_RULES_OVERRIDE`
as part of enabling RC so that a `CMAKE_BUILD_TYPE_INIT` setting
in the override file is honored.

Fixes: #19401
 2019-06-27 07:39:24 -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
Robert Maynard
96b10e47be Remove unused variables from cmFindPackageCommand 2019-06-26 16:06:21 -04:00
Raffi Enficiaud
11e0009b77 FindMatlab: EXCLUDE_FROM_ALL parameter to matlab_add_mex 
Enabling a mex target to be excluded from the `all` target.
 2019-06-26 19:53:02 +02: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