summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'CPackRPM-trans-scripts'Brad King2020-02-265-17/+52
|\ | | | | | | | | | | | | c0534c4a68 CPackRPM: Add PRE_/POST_TRANS scripts Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4387
| * CPackRPM: Add PRE_/POST_TRANS scriptsSarang Joshi2020-02-245-17/+52
| | | | | | | | | | | | Add variables for PRE_TRANS and POST_TRANS scripts. Fixes: #18917
* | Merge topic 'bzip2-warnings'Brad King2020-02-261-1/+3
|\ \ | | | | | | | | | | | | | | | | | | db1447b2cf bzip2: Disable MSVC warnings in 3rd party code Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4395
| * | bzip2: Disable MSVC warnings in 3rd party codeBrad King2020-02-251-1/+3
| | | | | | | | | | | | | | | In commit 35acaa90c5 (bzip2: Add compilation flags to disable warnings in third-party code, 2020-02-24) we forgot to disable warnings for MSVC.
* | | Merge branch 'release-3.17'Brad King2020-02-260-0/+0
|\ \ \
| * \ \ Merge topic 'cmake-cfg-intdir-ninja-multi' into release-3.17Brad King2020-02-261-0/+7
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | \ \ \ Merge topic 'cmake-cfg-intdir-ninja-multi'Brad King2020-02-261-0/+7
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Help: Note that CMAKE_CFG_INTDIR is not fully supported on Ninja Multi-ConfigKyle Edwards2020-02-251-0/+7
| | | | |
* | | | | Merge branch 'release-3.17'Brad King2020-02-260-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge topic 'RunCMake-test-lang' into release-3.17Brad King2020-02-261-0/+3
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 95dbcf0598 Tests: fix RunCMake.Make test when run on systems with non-english locale Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4389
* | \ \ \ \ Merge topic 'RunCMake-test-lang'Brad King2020-02-261-0/+3
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 95dbcf0598 Tests: fix RunCMake.Make test when run on systems with non-english locale Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4389
| * | | | | Tests: fix RunCMake.Make test when run on systems with non-english localeRolf Eike Beer2020-02-261-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set `LANG=C` in the environment so the output of `make` is predictable. Fixes: #19689
* | | | | | Merge branch 'release-3.17'Brad King2020-02-260-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge topic 'ninja-multi-fix-macos-failures' into release-3.17Brad King2020-02-262-3/+3
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | Merge topic 'ninja-multi-fix-macos-failures'Brad King2020-02-262-3/+3
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | Tests: Fix CFBundleTest for Ninja Multi-ConfigKyle Edwards2020-02-251-1/+1
| | | | | |
| * | | | | Tests: Fix CustComDepend test for Ninja Multi-ConfigKyle Edwards2020-02-251-2/+2
| |/ / / /
* | | | | CMake Nightly Date StampKitware Robot2020-02-261-1/+1
| | | | |
* | | | | Merge topic 'swig-fortran'Marc Chevrier2020-02-256-0/+145
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | a1909e26ac UseSWIG: Enable SWIG Fortran target language Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4380
| * | | | UseSWIG: Enable SWIG Fortran target languageSeth R Johnson2020-02-246-0/+145
| | | | |
* | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | |
generated by cgit v0.12 at 2024-12-29 19:49:50 (GMT)