mirrors/cmake
2
0 Fork 0
mirror of https://gitlab.kitware.com/cmake/cmake.git synced 2026-10-06 04:03:27 +03:00
Code Activity
47,352 Commits 2 Branches 415 Tags
94de927cab19609aeeff032c64f16cfd257fca2f
Commit Graph
47352 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastian Holtermann e50fa44a35 cmake: Refactor file extension list setup 
Refactor the file extention list setup in cmake.h/cxx and add file extensions
lists for Cuda and Fortran.
 2019-07-04 13:46:15 +02:00
Sebastian Holtermann 8214ad442f Tests: Autogen: Extend SameName test with additional header extensions 
This adds additional headers with suffixes ".hh" and uppercase ".H" to the
QtAutogen/SameName test.
 2019-07-04 12:30:40 +02:00
Sebastian Holtermann 4a9154537c Autogen: Use cmake::IsHeader/SourceExtension for file type detection 
In the QtAutogen initializer use `cmake::IsHeaderExtension` and
`cmake::IsSourceExtension` instead of `cmSystemTools::GetFileFormat` for file
type detection.

Closes: #13904
 2019-07-04 12:30:40 +02:00
Kitware Robot f889e0320c CMake Nightly Date Stamp 2019-07-04 00:01:07 -04:00
Rolf Eike Beer 59a30f2acf FindProtobuf: libprotoc also needs C++11 2019-07-03 18:49:49 +02:00
Rolf Eike Beer 194adaf985 Tests: require C++11 for some protobuf tests 
Newer versions of Protobuf require C++11, which is reflected in the imported
target created by FindProtobuf. Manually set this for all tests that only use
the variables.
 2019-07-03 18:49:49 +02:00
Craig Scott d5b722bbbd Help: Remove mention of CMAKE_INSTALL_DO_STRIP 
It isn't yet clear whether we want to make this part of the
documented API for the install script. Remove it from the
docs before it appears in an official release for now.

Relates: #18997
 2019-07-03 23:38:25 +10:00
Craig Scott ddc7ea4696 Help: Clarify how to provide multiple targets with cmake --target 2019-07-03 23:38:25 +10:00
Craig Scott c509f38b7b Help: Add missing xref for CMAKE_EXECUTE_PROCESS_COMMAND_ECHO 2019-07-03 23:38:25 +10:00
Craig Scott 9cc6befe1b Help: Improve formatting of list(TRANSFORM) sub-options 2019-07-03 23:38:25 +10:00
Craig Scott 074fbdb73f Help: Clean up trivial typos and grammar 2019-07-03 23:38:25 +10:00
Brad King 0bddcce987 Merge branch 'release-3.15' 2019-07-03 07:32:12 -04:00
Brad King c723ff216f Merge topic 'FindPostgreSQL-lib-dir' 
d21b890a4c FindPostgreSQL: Fix regression in computation of library directory

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3505
 2019-07-03 07:31:10 -04:00
Brad King 1f389b4498 Merge branch 'FindPostgreSQL-lib-dir' into release-3.15 
Merge-request: !3505
 2019-07-03 07:30:43 -04:00
Craig Scott 8f93d76b79 Merge branch 'release-3.15' 2019-07-03 19:09:44 +10:00
Craig Scott 581e011cef Merge topic 'doc-toolchain-file-CMAKE_SOURCE_DIR' into release-3.15 
Merge-request: !3495
 2019-07-03 19:08:45 +10:00
Craig Scott 1cc8f85e1a Merge topic 'doc-toolchain-file-CMAKE_SOURCE_DIR' 
16434fe303 Help: Discourage using CMAKE_SOURCE_DIR in toolchain files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3495
 2019-07-03 05:01:13 -04:00
Artalus f4ed56ab63 Fix elseif() in place of else() 2019-07-03 11:57:53 +03:00
Kitware Robot f219b48d8a CMake Nightly Date Stamp 2019-07-03 00:01:09 -04:00
Oleg Chernovskiy 16434fe303 Help: Discourage using CMAKE_SOURCE_DIR in toolchain files 
Fixes: #19390
 2019-07-03 08:45:29 +10:00
Saleem Abdulrasool 08cd7f6a02 Swift: support multithreaded compilation 
Query the number of logical CPUs available to enable parallel
compilation for Swift.
 2019-07-02 10:45:07 -07:00
Stephen Manz 365ee32db8 Help: Valid range for test property, SKIP_RETURN_CODE, is 0 to 255, inclusive 2019-07-02 08:46:49 -07:00
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
Brad King d21b890a4c FindPostgreSQL: Fix regression in computation of library directory 
Since commit 368bcba28a (FindPostgreSQL: Find debug lib, imported
configs, 2019-05-09, v3.15.0-rc1~93^2) the `PostgreSQL_LIBRARY` variable
may contain a list and therefore should not be passed to the
`get_filename_component` command directly.  Instead spell out the logic
to compute `PostgreSQL_LIBRARY_DIR` from one of the per-configuration
variables.

Fixes: #19444
 2019-07-02 07:32:14 -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
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 0998f6396a Merge branch 'upstream-expat' into update-expat 
* upstream-expat:
  expat 2019-06-19 (d3b78b42)
 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