Commit Graph

47144 Commits

Author SHA1 Message Date
Cristian Adam
7e9b9fe918 PCH: Copy the timestamp from an absolute header file
If `target_precompile_headers` contains a file from the project,
then CMake will set the timestamp for `cmake_pch.h|xx` from that
file.

This helps with ccache and precompile headers.

Fixes: #19923
2020-02-26 10:05:47 -05:00
Kyle Edwards
3bff839706 Help: Clarify that the CTest resource allocation feature doesn't oversubscribe 2020-02-26 09:56:40 -05:00
Brad King
ab2d170c74 Merge topic 'CPackRPM-trans-scripts'
c0534c4a68 CPackRPM: Add PRE_/POST_TRANS scripts

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4387
2020-02-26 08:52:09 -05:00
Brad King
db3cfac375 Merge topic 'bzip2-warnings'
db1447b2cf bzip2: Disable MSVC warnings in 3rd party code

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4395
2020-02-26 08:50:56 -05:00
Marc Chevrier
1dc524f202 FindPython: Do not cache computed result variables in CMake 3.16
Since commit 06d9e67fbd (FindPython: Add capability to specify directly
artifacts, 2019-08-15, v3.16.0-rc1~157^2) we accidentally add the result
variables `Python*_LIBRARY_RELEASE` and `Python*_LIBRARY_DEBUG` to the
cache.  They are always computed from other results and so should not be
presented to users in cmake-gui and ccmake to edit.

Issue: #20362
2020-02-26 08:09:21 -05:00
Marc Chevrier
602d1d8201 FindPython: Mark non-public cache entries INTERNAL in CMake 3.16
Since commit 06d9e67fbd (FindPython: Add capability to specify directly
artifacts, 2019-08-15, v3.16.0-rc1~157^2) we accidentally expose cache
entries named `_Python...` to users in cmake-gui and ccmake.  Mark those
entries as `INTERNAL` to hide them.

Issue: #20362
2020-02-26 08:09:16 -05:00
Marc Chevrier
42c6a1bfee FindPython: Do not cache computed result variables
Since commit 06d9e67fbd (FindPython: Add capability to specify directly
artifacts, 2019-08-15, v3.16.0-rc1~157^2) we accidentally add the result
variables `Python*_LIBRARY_RELEASE` and `Python*_LIBRARY_DEBUG` to the
cache.  They are always computed from other results and so should not be
presented to users in cmake-gui and ccmake to edit.

Issue: #20362
2020-02-26 08:08:26 -05:00
Marc Chevrier
a7b4516e1a FindPython: Mark non-public cache entries INTERNAL
Since commit 06d9e67fbd (FindPython: Add capability to specify directly
artifacts, 2019-08-15, v3.16.0-rc1~157^2) we accidentally expose cache
entries named `_Python...` to users in cmake-gui and ccmake.  Mark those
entries as `INTERNAL` to hide them.

Issue: #20362
2020-02-26 08:08:03 -05:00
Brad King
e97881a518 Merge topic 'cmake-cfg-intdir-ninja-multi' into release-3.17
853c3eac6d Help: Note that CMAKE_CFG_INTDIR is not fully supported on Ninja Multi-Config

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4397
2020-02-26 07:51:13 -05:00
Brad King
58a31d14b7 Merge branch 'release-3.17' 2020-02-26 07:51:13 -05:00
Brad King
549b1576d2 Merge topic 'cmake-cfg-intdir-ninja-multi'
853c3eac6d Help: Note that CMAKE_CFG_INTDIR is not fully supported on Ninja Multi-Config

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4397
2020-02-26 07:51:13 -05:00
Brad King
d13489fe2b Merge topic 'RunCMake-test-lang' into release-3.17
95dbcf0598 Tests: fix RunCMake.Make test when run on systems with non-english locale

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4389
2020-02-26 07:42:23 -05:00
Brad King
d2a6085e4d Merge branch 'release-3.17' 2020-02-26 07:42:23 -05:00
Brad King
0b903779e8 Merge topic 'RunCMake-test-lang'
95dbcf0598 Tests: fix RunCMake.Make test when run on systems with non-english locale

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4389
2020-02-26 07:42:23 -05:00
Rolf Eike Beer
95dbcf0598 Tests: fix RunCMake.Make test when run on systems with non-english locale
Set `LANG=C` in the environment so the output of `make` is predictable.

Fixes: #19689
2020-02-26 07:41:07 -05:00
Brad King
ba1dc99098 Merge topic 'ninja-multi-fix-macos-failures' into release-3.17
cc4e304800 Tests: Fix CFBundleTest for Ninja Multi-Config
bcf4da52d8 Tests: Fix CustComDepend test for Ninja Multi-Config

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4396
2020-02-26 07:32:58 -05:00
Brad King
9f3eb040ed Merge branch 'release-3.17' 2020-02-26 07:32:58 -05:00
Brad King
919d793842 Merge topic 'ninja-multi-fix-macos-failures'
cc4e304800 Tests: Fix CFBundleTest for Ninja Multi-Config
bcf4da52d8 Tests: Fix CustComDepend test for Ninja Multi-Config

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4396
2020-02-26 07:32:58 -05:00
Richard
426941c433 Autogen: Recognize the new Q_NAMESPACE_EXPORT macro in AUTOMOC
Qt 5.14 introduced a new moc keyword `Q_NAMESPACE_EXPORT`.

Qt-Issue: https://bugreports.qt.io/browse/QTBUG-68014
2020-02-26 07:18:44 -05:00
Kitware Robot
4116cd7599 CMake Nightly Date Stamp 2020-02-26 00:01:07 -05:00
Marc Chevrier
facadf6c30 Merge topic 'swig-fortran'
a1909e26ac UseSWIG: Enable SWIG Fortran target language

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4380
2020-02-25 17:19:51 -05:00
Kyle Edwards
853c3eac6d Help: Note that CMAKE_CFG_INTDIR is not fully supported on Ninja Multi-Config 2020-02-25 14:00:43 -05:00
Kyle Edwards
cc4e304800 Tests: Fix CFBundleTest for Ninja Multi-Config 2020-02-25 13:39:46 -05:00
Kyle Edwards
bcf4da52d8 Tests: Fix CustComDepend test for Ninja Multi-Config 2020-02-25 13:39:46 -05:00
Cristian Adam
54e4f2ad45 cmake_command: Add command to INVOKE other commands by name
Fixes: #18392
2020-02-25 13:14:17 -05:00
Joachim Wuttke (h)
d98064f156 Help: cmake-generator-expressions(7): Target-Dependent Queries
Explain ``tgt`` at beginning of section.
Then refer to ``tgt`` without redundant reexplanations.
2020-02-25 10:39:18 -05:00
Brad King
db1447b2cf bzip2: Disable MSVC warnings in 3rd party code
In commit 35acaa90c5 (bzip2: Add compilation flags to disable warnings
in third-party code, 2020-02-24) we forgot to disable warnings for MSVC.
2020-02-25 10:32:21 -05:00
Alexander Boczar
7c944da757 VS: Add target property to explicitly control solution deployment
Add a `VS_SOLUTION_DEPLOY` property to control solution deploy mark.

Fixes: #20346
2020-02-25 10:24:23 -05:00
Brad King
cbb235efb9 Merge branch 'backport-kwsys-terminal-st' into update-kwsys 2020-02-25 09:44:10 -05:00
Brad King
06702acb28 KWSys: Terminal: Add st-256color to VT100 color support whitelist
Backport KWSys commit `44eaaa6e8` (Terminal: Add st-256color to VT100
color support whitelist, 2020-02-19) to CMake 3.17.
2020-02-25 09:42:55 -05:00
KWSys Upstream
4e8c4c7ebe KWSys 2020-02-25 (b14ce28a)
Code extracted from:

    https://gitlab.kitware.com/utils/kwsys.git

at commit b14ce28a237ec0b0d2743418e18cf41ca6bf3a78 (master).

Upstream Shortlog
-----------------

Leon Richardt (1):
      44eaaa6e Terminal: Add st-256color to VT100 color support whitelist

Mathieu Westphal (1):
      acee32bd Adding DecodeUrl and GetFilePathFromURI methods
2020-02-25 09:41:26 -05:00
Brad King
71764b88d6 Merge branch 'upstream-KWSys' into update-kwsys
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2020-02-25 (b14ce28a)
2020-02-25 09:41:26 -05:00
Brad King
64198c4f07 Merge topic 'update-bzip2'
592ce3e89b Merge branch 'upstream-bzip2' into update-bzip2
03e9d5afb3 bzip2 2019-07-13 (6a8690fc)
39f2a9b286 bzip2: Update import script to get bzip2 1.0.8
35acaa90c5 bzip2: Add compilation flags to disable warnings in third-party code
3d47b0ae97 Merge branch 'upstream-bzip2' into update-bzip2
05c3d1bcdb bzip2 2007-12-10 (a1d78c55)
2c40844891 bzip2: Remove all sources to make room for fresh import
09ab19a696 bzip2: add script to import bzip2 from upstream

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4391
2020-02-25 09:11:17 -05:00
Brad King
693a1d7fcb Merge topic 'GoogleTest-optimize'
dac201442d GoogleTest: Optimize gtest_discover_tests

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4371
2020-02-25 09:10:03 -05:00
Steffen Seckler
dac201442d GoogleTest: Optimize gtest_discover_tests
Prior to this, `gtest_discover_tests` could take multiple minutes if
many tests are present.  This behavior was caused by a repeated addition
to the variable `script` in the `add_command` function using:

    set(script "${script}${NAME}(${_args})\n" PARENT_SCOPE)

This takes very long for large variables.

This commit flushes the contents of the variable to ${CTEST_FILE} after
a certain size of the variable is reached.

In addition:

- cmake_minimum_required(VERSION ${CMAKE_VERSION}) is set to allow usage
  of new policies.  In particular, CMP0053 speeds up variable expansion.
- No longer appends strings using set(), but instead uses string(APPEND).
- An additional buffer for the tests variable is set.
2020-02-25 09:03:56 -05:00
Brad King
c66dccb6a3 Merge topic 'FindOpenCL-cuda-paths'
9078101d75 FindOpenCL: Add more paths on 64-bit Linux

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4336
2020-02-25 09:02:15 -05:00
Brad King
cf789bb447 Merge topic 'ctest-failure-error-reporting' into release-3.17
a5be3916ee CTest: Provide more detailed information on resource allocation error
f0df3ed5b9 Refactor: Provide more detailed error information from TryAllocateResources()
f1c34443b7 CTest: Improve error reporting with bad working directory for tests
1dec359422 Refactor: Require detail when calling cmCTestRunTest::StartFailure()

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4390
2020-02-25 09:00:25 -05:00
Brad King
d3d72b55f5 Merge branch 'release-3.17' 2020-02-25 09:00:25 -05:00
Brad King
d5e7bb1b4b Merge topic 'ctest-failure-error-reporting'
a5be3916ee CTest: Provide more detailed information on resource allocation error
f0df3ed5b9 Refactor: Provide more detailed error information from TryAllocateResources()
f1c34443b7 CTest: Improve error reporting with bad working directory for tests
1dec359422 Refactor: Require detail when calling cmCTestRunTest::StartFailure()

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4390
2020-02-25 09:00:25 -05:00
Brad King
b59a84a570 Merge branch 'release-3.17' 2020-02-25 08:58:18 -05:00
Brad King
8a7c485d3f Merge topic 'FindCUDA-no-threads-target' into release-3.17
b9d67447c3 FindCUDA: Only depend on Threads::Threads on platforms that need it

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4377
2020-02-25 08:58:17 -05:00
Brad King
4d339831b0 Merge topic 'FindCUDA-no-threads-target'
b9d67447c3 FindCUDA: Only depend on Threads::Threads on platforms that need it

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4377
2020-02-25 08:58:17 -05:00
Brad King
31e4d3a8f9 Merge branch 'release-3.16' 2020-02-25 08:56:25 -05:00
Brad King
236ac2b1eb Merge branch 'release-3.15' 2020-02-25 08:56:20 -05:00
Brad King
f010073170 Merge branch 'release-3.17' 2020-02-25 08:55:50 -05:00
Brad King
2b615e6f5e Merge topic 'FindPkgConfig-scope'
c3e0d1ffe9 FindPkgConfig: set policies CMP0054 and CMP0057 to new

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4388
2020-02-25 08:55:50 -05:00
Brad King
3a6481670f Merge topic 'FindPkgConfig-scope' into release-3.17
c3e0d1ffe9 FindPkgConfig: set policies CMP0054 and CMP0057 to new

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4388
2020-02-25 08:55:49 -05:00
Brad King
078b902dfb Merge branch 'release-3.17' 2020-02-25 08:54:45 -05:00
Brad King
1d338dcf46 Merge topic 'cuda-non-device-link' into release-3.17
7da2c8c543 Merge branch 'backport-cuda-non-device-link'
738f3f23aa Ninja: Do not use nvcc response files with non-nvcc tools

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !4376
2020-02-25 08:54:45 -05:00
Brad King
64ed4f6f99 Merge topic 'cuda-non-device-link'
7da2c8c543 Merge branch 'backport-cuda-non-device-link'
738f3f23aa Ninja: Do not use nvcc response files with non-nvcc tools

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !4376
2020-02-25 08:54:45 -05:00