summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* GoogleTest: Add release note for XML_OUTPUT_DIRAlexander Stein2020-03-131-0/+6
|
* GoogleTest: Add test case for XML_OUTPUT_DIRAlexander Stein2020-03-134-0/+69
|
* GoogleTest: Add XML_OUTPUT_DIR parameterAlexander Stein2020-03-132-1/+16
| | | | | | | | | | | | When executing googltests in parallel using 'ctest -j n' and using '--gtest_output=xml' there is a race condition upon file creation. See googletest issue https://github.com/google/googletest/issues/2506. As all testcases (potentially) can be run in parallel each testcase has to create it's own XML JUnit file. EXTRA_ARGS is not suitable because it is identical per testsuite. So instead a new (opitional) parameter has been introduced to specify the storage location for each test of the testsuite.
* Merge topic 'GoogleTest-gtest_discover_tests-failure'Brad King2020-03-137-3/+33
|\ | | | | | | | | | | | | | | | | | | 2ba8ac07ed GoogleTest: Fix CTest not failing if gtest_discover_tests fails 2c9680eec5 GoogleTest: Add missing test case for gtest_discover_tests failure Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Steffen Seckler <steffen.seckler@tum.de> Acked-by: Matthew Woehlke <matthew.woehlke@kitware.com> Merge-request: !4466
| * GoogleTest: Fix CTest not failing if gtest_discover_tests failsRyan Thornton2020-03-111-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes regression introduced dac201442d (GoogleTest: Optimize gtest_discover_tests, 2020-02-18). The generated CTest include files has the form: if(EXISTS "foo_tests.cmake") include("foo_tests.cmake") else() add_test(foo_NOT_BUILT foo_test_NOT_BUILT) endif() Starting in dac201442d, an empty discovery_timeout_test[1]_tests.cmake was written as soon as GoogleTestAddTests was processed. This meant, that even if test discovery would fail (due to a crash or timeout in the executable), we would always produce an empty CTest file. So instead of reporting: Unable to find executable: foo_NOT_BUILT Errors while running CTest We instead get: No tests were found!!! To fix the problem, we WRITE the file on the first call to flush_script, thus creating the file once we know we have valid output and the call to gtest_discover_tests hasn't failed. After creating the file, we then set the mode to APPEND and append to the file for every subsequent call.
| * GoogleTest: Add missing test case for gtest_discover_tests failureRyan Thornton2020-03-116-1/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Discovery timeout test needs split out into two components: - build - test Building the project should result in a failure due to the timeout when executing gtest discovery as a post build step. Likewise, if you ran CTest after this build failure, we should *also* detect that the discovery_timeout_test has not been built because no discovery_timeout_test[1]_tests.cmake has been created due to the test discovery failure (caused by the timeout).
* | Merge topic 'cuda_language'Brad King2020-03-133-9/+11
|\ \ | | | | | | | | | | | | | | | | | | f75bea1071 CUDA: Abstract language flag to compiler modules Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4464
| * | CUDA: Abstract language flag to compiler modulesRaul Tambre2020-03-113-9/+11
| | | | | | | | | | | | | | | Separate this detail out into compiler-specific modules. Required for Clang support, as it uses slightly different language flags.
* | | CMake Nightly Date StampKitware Robot2020-03-131-1/+1
| | |
* | | Merge branch 'release-3.17'Brad King2020-03-120-0/+0
|\ \ \
| * \ \ Merge topic 'generated-byproducts-docs' into release-3.17Brad King2020-03-124-11/+30
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3eb2b62d21 Help: Expand discussion of GENERATED / BYPRODUCTS 1853c7f571 Help: Add missing word in AUTOGEN_TARGET_DEPENDS.rst Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4472
* | \ \ \ Merge topic 'generated-byproducts-docs'Brad King2020-03-124-11/+30
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 3eb2b62d21 Help: Expand discussion of GENERATED / BYPRODUCTS 1853c7f571 Help: Add missing word in AUTOGEN_TARGET_DEPENDS.rst Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4472
| * | | | Help: Expand discussion of GENERATED / BYPRODUCTSFeRD (Frank Dana)2020-03-123-10/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Mention the Makefile Generators' `make clean` removal in the BYPRODUCTS section of add_custom_command and add_custom_target - Expand the GENERATED property docs' description of which files will be marked with the property, and of what it implies (including `make clean` removal)
| * | | | Help: Add missing word in AUTOGEN_TARGET_DEPENDS.rstFeRD (Frank Dana)2020-03-121-1/+1
| |/ / /
* | | | Merge branch 'release-3.17'Brad King2020-03-120-0/+0
|\ \ \ \ | |/ / /
| * | | CMake 3.17.0-rc3v3.17.0-rc3Brad King2020-03-121-1/+1
| | | |
* | | | Merge branch 'release-3.17'Brad King2020-03-120-0/+0
|\ \ \ \ | |/ / /
| * | | Merge topic 'apple-clang-flags-c++17' into release-3.17Brad King2020-03-122-2/+8
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a67f2d00d8 Apple Clang: add flags for C++17 standard Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4468
* | \ \ \ Merge topic 'apple-clang-flags-c++17'Brad King2020-03-122-2/+8
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | a67f2d00d8 Apple Clang: add flags for C++17 standard Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4468
| * | | | Apple Clang: add flags for C++17 standardMarc Chevrier2020-03-122-2/+8
| | | | |
* | | | | Merge branch 'release-3.16'Brad King2020-03-120-0/+0
|\ \ \ \ \
| * \ \ \ \ Merge branch 'swift-link-line-spaces' into release-3.16Brad King2020-03-121-3/+5
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !4469
* | \ \ \ \ \ Merge branch 'release-3.17'Brad King2020-03-120-0/+0
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge topic 'swift-link-line-spaces' into release-3.17Brad King2020-03-121-3/+5
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | af39d1b993 Swift: Fix quoting of library search paths with spaces Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4469
* | | | | | | Merge topic 'swift-link-line-spaces'Brad King2020-03-121-3/+5
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | af39d1b993 Swift: Fix quoting of library search paths with spaces Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4469
| * | | | | | Swift: Fix quoting of library search paths with spacesSaleem Abdulrasool2020-03-121-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The library search paths added by commit 2746c61e6d (Swift: Add library search paths for dependencies, 2019-06-09, v3.16.0-rc1~561^2) need to be quoted properly on command lines to handle spaces and such. This was already done by `cmLinkLineComputer::ComputeLinkPath` for non-Swift-specific link directories.
* | | | | | | Merge topic 'add-cache-definition'Brad King2020-03-1217-39/+44
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 36a5b3d1d1 cmMakefile::AddCacheDefinition: Add overload that accepts std::string value Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4457
| * | | | | | | cmMakefile::AddCacheDefinition: Add overload that accepts std::string valueVitaly Stakhovsky2020-03-1117-39/+44
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge topic 'modernize-memory-management'Brad King2020-03-126-60/+100
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f964739ead cmCTestRunTest: modernize memory management Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4454
| * | | | | | | cmCTestRunTest: modernize memory managementMarc Chevrier2020-03-116-60/+100
| | | | | | | |
* | | | | | | | Merge topic 'CMakeFindFrameworks-CMAKE_FRAMEWORK_PATH'Brad King2020-03-121-7/+19
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c841d43d70 CMakeFindFrameworks: Search CMAKE_FRAMEWORK_PATH Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4461
| * | | | | | | | CMakeFindFrameworks: Search CMAKE_FRAMEWORK_PATHBo Anderson2020-03-111-7/+19
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'release-3.17'Brad King2020-03-120-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Merge topic 'ctest-curl-debugfunction' into release-3.17Brad King2020-03-122-2/+2
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7a1cce210b CTest: Fix our internal CURL_DEBUGFUNCTION to conform to CURL docs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4459
* | \ \ \ \ \ \ \ Merge topic 'ctest-curl-debugfunction'Brad King2020-03-122-2/+2
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7a1cce210b CTest: Fix our internal CURL_DEBUGFUNCTION to conform to CURL docs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4459
| * | | | | | | | CTest: Fix our internal CURL_DEBUGFUNCTION to conform to CURL docsBetsy McPhail2020-03-112-2/+2
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The curl debug callback function must return ``0``. Fixes: #20449
* | | | | | | | Merge branch 'release-3.17'Brad King2020-03-120-0/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge topic 'FindPython-ENV-CMAKE_FRAMEWORK_PATH' into release-3.17Brad King2020-03-121-1/+2
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1044776472 FindPython: Convert env CMAKE_FRAMEWORK_PATH to CMake path Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Marc Chevrier <marc.chevrier@gmail.com> Merge-request: !4462
* | \ \ \ \ \ \ \ Merge topic 'FindPython-ENV-CMAKE_FRAMEWORK_PATH'Brad King2020-03-121-1/+2
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1044776472 FindPython: Convert env CMAKE_FRAMEWORK_PATH to CMake path Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Marc Chevrier <marc.chevrier@gmail.com> Merge-request: !4462
| * | | | | | | | FindPython: Convert env CMAKE_FRAMEWORK_PATH to CMake pathBo Anderson2020-03-111-1/+2
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'release-3.17'Brad King2020-03-120-0/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge topic 'swift-rpath' into release-3.17Brad King2020-03-121-4/+6
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f481b3a947 Swift: repair RPATH handling for macOS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4456
* | \ \ \ \ \ \ \ Merge topic 'swift-rpath'Brad King2020-03-121-4/+6
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f481b3a947 Swift: repair RPATH handling for macOS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4456
| * | | | | | | | Swift: repair RPATH handling for macOSSaleem Abdulrasool2020-03-111-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The configuration previously handled Linux properly but did not function on macOS as `ld64` does not support `:` delimited paths. Account for that by setting it to the empty string which will use multiple invocations of the `-Xlinker -rpath -Xlinker ...` pattern to compute the correct RPATH.
* | | | | | | | | Merge branch 'release-3.17'Craig Scott2020-03-120-0/+0
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge topic 'rename-macho-version-properties' into release-3.17Craig Scott2020-03-1211-44/+44
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 14732d3f30 macOS: Rename OSX_*_VERSION properties to MACHO_*_VERSION Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4452
* | | | | | | | | Merge topic 'rename-macho-version-properties'Craig Scott2020-03-1211-44/+44
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 14732d3f30 macOS: Rename OSX_*_VERSION properties to MACHO_*_VERSION Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4452
| * | | | | | | | macOS: Rename OSX_*_VERSION properties to MACHO_*_VERSIONBrad King2020-03-1211-44/+44
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The properties added by commit 4a62e3d97c (macOS: Add OSX_COMPATIBILITY_VERSION and OSX_CURRENT_VERSION properties, 2020-01-24, v3.17.0-rc1~80^2~1) are general-purpose for all platforms using Mach-O formats and not just on OS X. Rename them accordingly. The properties are new to the CMake 3.17 release so we can rename them without compatibility concerns. Fixes: #20442
* | | | | | | | CMake Nightly Date StampKitware Robot2020-03-121-1/+1
| |_|/ / / / / |/| | | | | |
* | | | | | | Merge topic 'loops-improve'Brad King2020-03-115-24/+19
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cbbca9ee2a Convert more loops to range-based for-loops 9296cd0551 GHS: Name range-based for-loop variable types explicitly db17de2438 GHS: Use cm::erase in place of loop Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4446