mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-05 05:39:57 -05:00
Code Issues Packages Projects Releases Wiki Activity
44,029 Commits 2 Branches 401 Tags
8a42cd155f00d9418fa60f995b466fff7c1afaa5
Commit Graph

44029 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King 8a42cd155f Merge topic 'static' 
8aa0b63bc6 Swift: add rules for static linking

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3492
 2019-07-02 08:45:58 -04:00
Brad King 67859b3d79 Merge topic 'cross_ref_CUDAHOSTCXX_in_CMAKE_CUDA_HOST_COMPILER' 
d3ebef4f70 CMAKE_CUDA_HOST_COMPILER: Document it takes priority over CUDAHOSTCXX

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3490
 2019-07-02 08:44:54 -04:00
Brad King b08b640926 Merge topic 'deprecate-policy-old' 
cf821ff3c4 Add deprecation warnings for policies CMP0067 and below

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3502
 2019-07-02 08:44:02 -04:00
Brad King 0b83df71e7 Merge topic 'double-export-error-message' 
27d6e51ae9 Tests: add tests for export set error messages
49cfd39007 cmExportBuildFileGenerator: improve error message

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3486
 2019-07-02 08:42:55 -04:00
Brad King cba6c59e70 Merge branch 'release-3.15' 2019-07-02 08:41:36 -04:00
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 c56201bdac Merge branch 'qt-5.13' into release-3.15 
Merge-request: !3500
 2019-07-01 10:23:48 -04:00
Brad King cf821ff3c4 Add deprecation warnings for policies CMP0067 and below 
The OLD behaviors of all policies are deprecated, but only by
documentation.  Add an explicit deprecation diagnostic for policies
introduced in CMake 3.8 and below to encourage projects to port away
from setting policies to OLD.
 2019-07-01 10:21:06 -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 9d0ad814f6 Merge branch 'update-expat' into release-3.15 
Merge-request: !3501
 2019-07-01 09:44:52 -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
Brad King 7a3d9b08b9 Merge branch 'cuda-no-device-link-when-disabled' into release-3.15 
Merge-request: !3491
 2019-07-01 08:36:28 -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
Saleem Abdulrasool 8aa0b63bc6 Swift: add rules for static linking 
The Swift driver recently learnt how to generate static libraries using
the `-static` flag.  This enables us to generate proper static libraries
with dependency tracking with Swift as well.
 2019-06-27 21:28:48 -07:00
Kitware Robot 3b90096838 CMake Nightly Date Stamp 2019-06-28 00:01:07 -04:00
Robert Maynard d3ebef4f70 CMAKE_CUDA_HOST_COMPILER: Document it takes priority over CUDAHOSTCXX 2019-06-27 14:39:24 -04:00
Ben Boeckel 27d6e51ae9 Tests: add tests for export set error messages 2019-06-27 10:57:34 -04:00
Ben Boeckel 49cfd39007 cmExportBuildFileGenerator: improve error message 
When an exported target depends on another exported target that is
included in multiple build export sets, the error message was woefully
unhelpful. Now, include information about what build exports the
dependent target was included in with instructions for fixing the
problem that are actually helpful.
 2019-06-27 10:57:34 -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