Commit Graph

46976 Commits

Author SHA1 Message Date
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
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
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
d2a6085e4d Merge branch 'release-3.17' 2020-02-26 07:42:23 -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
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
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
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
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
Kitware Robot
2fb84a9352 CMake Nightly Date Stamp 2020-02-25 00:01:09 -05:00
Kyle Edwards
a5be3916ee CTest: Provide more detailed information on resource allocation error 2020-02-24 15:44:01 -05:00
Kyle Edwards
f0df3ed5b9 Refactor: Provide more detailed error information from TryAllocateResources() 2020-02-24 15:44:01 -05:00
Kyle Edwards
f1c34443b7 CTest: Improve error reporting with bad working directory for tests 2020-02-24 15:44:01 -05:00
Kyle Edwards
1dec359422 Refactor: Require detail when calling cmCTestRunTest::StartFailure() 2020-02-24 15:44:01 -05:00
Brad King
ede4497cb2 Merge branch 'FindPkgConfig-scope' into release-3.16
Merge-request: !4388
2020-02-24 14:45:34 -05:00
Robert Maynard
b9d67447c3 FindCUDA: Only depend on Threads::Threads on platforms that need it
In commit 46371132b3 (FindCUDA: CUDA_LIBRARIES doesn't contain raw
`-pthread`, 2019-11-11, v3.17.0-rc1~455^2) we introduced use of the
`Threads::Threads` target, but we do not `find_package(Threads)` on all
platforms.  Use the target only if it exists.
2020-02-24 14:14:38 -05:00
Matthäus G. Chajdas
9078101d75 FindOpenCL: Add more paths on 64-bit Linux
Add additional search paths for OpenCL on 64-bit Linux.

Fixes: #20084
2020-02-24 14:07:28 -05:00
Brad King
0aa91f9a66 Merge branch 'backport-cuda-non-device-link' into release-3.16
Merge-request: !4376
2020-02-24 13:36:24 -05:00
Brad King
553c454477 Merge branch 'backport-cuda-non-device-link' into release-3.15
Merge-request: !4376
2020-02-24 13:35:51 -05:00
Brad King
7da2c8c543 Merge branch 'backport-cuda-non-device-link' 2020-02-24 13:34:13 -05:00
Francisco Facioni
738f3f23aa Ninja: Do not use nvcc response files with non-nvcc tools
Since commit d91b5a72cd (Ninja: Add support for CUDA nvcc response
files, 2019-05-30, v3.15.0-rc1~8^2) we use NVCC's `--options-file`
option to avoid long link command lines via a response file.  However,
for non-device linking the host tools are used and the option does not
make sense.  Update the logic to use `--options-file` only for device
linking.  Linking with the host tools already has its own logic for
response files.

Fixes: #19954
2020-02-24 13:31:33 -05:00
Brad King
8d6ea4401c Merge topic 'pch-create-via-include' into release-3.17
5c6d6ec27c PCH: Clang: Update PCH usage flags to include original header

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4360
2020-02-24 13:12:08 -05:00
Brad King
f1b404d92e Merge branch 'release-3.17' 2020-02-24 13:12:08 -05:00
Brad King
41a12d3df0 Merge topic 'pch-create-via-include'
5c6d6ec27c PCH: Clang: Update PCH usage flags to include original header

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4360
2020-02-24 13:12:08 -05:00