summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'update-bzip2'Brad King2020-02-2560-151676/+361
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Merge branch 'upstream-bzip2' into update-bzip2Brad King2020-02-2416-84/+100
| |\ | | | | | | | | | | | | | | | # By bzip2 upstream * upstream-bzip2: bzip2 2019-07-13 (6a8690fc)
| | * bzip2 2019-07-13 (6a8690fc)bzip2 upstream2020-02-2416-84/+100
| | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://sourceware.org/git/bzip2.git at commit 6a8690fc8d26c815e798c588f796eabe9d684cf0 (bzip2-1.0.8).
| * | bzip2: Update import script to get bzip2 1.0.8Brad King2020-02-241-1/+1
| | |
| * | bzip2: Add compilation flags to disable warnings in third-party codeBrad King2020-02-241-0/+9
| | |
| * | Merge branch 'upstream-bzip2' into update-bzip2Brad King2020-02-2418-0/+8350
| |\ \ | | |/ | | | | | | | | | | | | # By bzip2 upstream * upstream-bzip2: bzip2 2007-12-10 (a1d78c55)
| | * bzip2 2007-12-10 (a1d78c55)bzip2 upstream2020-02-2418-0/+8350
| | | | | | | | | | | | | | | | Code extracted from: https://sourceware.org/git/bzip2.git at commit a1d78c550180bde11af6c559a01721c962f9f231 (bzip2-1.0.5).
| * bzip2: Remove all sources to make room for fresh importBrad King2020-02-2457-159717/+0
| |
| * bzip2: add script to import bzip2 from upstreamBrad King2020-02-241-0/+27
| |
* | Merge topic 'GoogleTest-optimize'Brad King2020-02-251-7/+38
|\ \ | | | | | | | | | | | | | | | | | | dac201442d GoogleTest: Optimize gtest_discover_tests Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4371
| * | GoogleTest: Optimize gtest_discover_testsSteffen Seckler2020-02-251-7/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | Merge topic 'FindOpenCL-cuda-paths'Brad King2020-02-251-0/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 9078101d75 FindOpenCL: Add more paths on 64-bit Linux Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4336
| * | | FindOpenCL: Add more paths on 64-bit LinuxMatthäus G. Chajdas2020-02-241-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | Add additional search paths for OpenCL on 64-bit Linux. Fixes: #20084
* | | | Merge branch 'release-3.17'Brad King2020-02-250-0/+0
|\ \ \ \
| * \ \ \ Merge topic 'ctest-failure-error-reporting' into release-3.17Brad King2020-02-259-27/+119
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | \ \ \ \ Merge topic 'ctest-failure-error-reporting'Brad King2020-02-259-27/+119
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | CTest: Provide more detailed information on resource allocation errorKyle Edwards2020-02-246-4/+72
| | | | | |
| * | | | | Refactor: Provide more detailed error information from TryAllocateResources()Kyle Edwards2020-02-242-16/+37
| | | | | |
| * | | | | CTest: Improve error reporting with bad working directory for testsKyle Edwards2020-02-242-2/+2
| | | | | |
| * | | | | Refactor: Require detail when calling cmCTestRunTest::StartFailure()Kyle Edwards2020-02-243-8/+11
| | | | | |
* | | | | | Merge branch 'release-3.17'Brad King2020-02-250-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge topic 'FindCUDA-no-threads-target' into release-3.17Brad King2020-02-251-1/+5
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b9d67447c3 FindCUDA: Only depend on Threads::Threads on platforms that need it Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4377
* | \ \ \ \ \ Merge topic 'FindCUDA-no-threads-target'Brad King2020-02-251-1/+5
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b9d67447c3 FindCUDA: Only depend on Threads::Threads on platforms that need it Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4377
| * | | | | | FindCUDA: Only depend on Threads::Threads on platforms that need itRobert Maynard2020-02-241-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | Merge branch 'release-3.16'Brad King2020-02-250-0/+0
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'FindPkgConfig-scope' into release-3.16Brad King2020-02-241-0/+6
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !4388
| * \ \ \ \ \ \ \ Merge branch 'backport-cuda-non-device-link' into release-3.16Brad King2020-02-242-3/+3
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !4376
* | \ \ \ \ \ \ \ \ Merge branch 'release-3.15'Brad King2020-02-250-0/+0
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'backport-cuda-non-device-link' into release-3.15Brad King2020-02-242-3/+3
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | Merge-request: !4376
* | | | | | | | | | | Merge branch 'release-3.17'Brad King2020-02-250-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge topic 'FindPkgConfig-scope' into release-3.17Brad King2020-02-251-0/+6
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c3e0d1ffe9 FindPkgConfig: set policies CMP0054 and CMP0057 to new Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4388
* | | | | | | | | | | Merge topic 'FindPkgConfig-scope'Brad King2020-02-251-0/+6
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c3e0d1ffe9 FindPkgConfig: set policies CMP0054 and CMP0057 to new Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4388
| * | | | | | | | | | FindPkgConfig: set policies CMP0054 and CMP0057 to newRolf Eike Beer2020-02-241-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | One may encounter warnings if FindPkgConfig is used in any project, even indirectly, that has set any of these policies to old explicitely or requires an older version.
* | | | | | | | | | | Merge branch 'release-3.17'Brad King2020-02-250-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge topic 'cuda-non-device-link' into release-3.17Brad King2020-02-252-3/+3
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | Merge topic 'cuda-non-device-link'Brad King2020-02-252-3/+3
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | Merge branch 'backport-cuda-non-device-link'Brad King2020-02-242-3/+3
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | / / / / | | |_|_|_|_|/ / / / | |/| | | | | | | |
| | * | | | | | | | Ninja: Do not use nvcc response files with non-nvcc toolsFrancisco Facioni2020-02-242-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | CMake Nightly Date StampKitware Robot2020-02-251-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge branch 'release-3.17'Brad King2020-02-240-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge topic 'pch-create-via-include' into release-3.17Brad King2020-02-243-3/+3
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5c6d6ec27c PCH: Clang: Update PCH usage flags to include original header Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4360
* | \ \ \ \ \ \ \ \ \ Merge topic 'pch-create-via-include'Brad King2020-02-243-3/+3
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | / | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5c6d6ec27c PCH: Clang: Update PCH usage flags to include original header Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4360
| * | | | | | | | | PCH: Clang: Update PCH usage flags to include original headerSergey Larin2020-02-243-3/+3
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add an additional include flag to PCH usage command line to fix programs that rely on `compile_commands.json` file. Pass it to the preprocessor directly to avoid compiler driver to change it to '-include-pch'. When preprocessor is requested to preprocess a file, it tries to get the original filename from '.pch' and uses that file for preprocessing. CMake generates a '.pch' file from the '.hxx' file by passing an empty '.cxx' source file to the compiler as a compilation unit and the header file with the '-include' flag. After that, compiler puts compilation unit filename in the '.pch' as the original filename. However, CMake build system uses empty file as the source file and passes the header file using '-include-pch' flag. As a result, Clang uses the wrong file for preprocessing and produces the corrupted preprocessed file. Fixes: #20355 Signed-off-by: Sergey Larin <cerg2010cerg2010@mail.ru>
* | | | | | | | | Merge topic 'ctest-resource-allocation-doc'Craig Scott2020-02-241-0/+9
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d966634b60 Help: Clarify that the CTest resource allocation feature doesn't oversubscribe Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4382
| * | | | | | | | | Help: Clarify that the CTest resource allocation feature doesn't oversubscribeKyle Edwards2020-02-211-0/+9
| | | | | | | | | |
* | | | | | | | | | CMake Nightly Date StampKitware Robot2020-02-241-1/+1
| | | | | | | | | |
* | | | | | | | | | CMake Nightly Date StampKitware Robot2020-02-231-1/+1
| | | | | | | | | |
* | | | | | | | | | CMake Nightly Date StampKitware Robot2020-02-221-1/+1
|/ / / / / / / / /
* | | | | | | | | CMake Nightly Date StampKitware Robot2020-02-211-1/+1
| | | | | | | | |
* | | | | | | | | Merge topic 'string-hex'Kyle Edwards2020-02-2012-1/+77
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 97b639d3f1 Help: Make note that file(READ ... HEX) produces lowercase letters 5395bf05eb string: Add new HEX sub-command Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4373