summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'file-archive'Brad King2020-03-1723-0/+507
|\ | | | | | | | | | | | | c7e1198a23 file: Add ARCHIVE_{CREATE|EXTRACT} subcommands Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4475
| * file: Add ARCHIVE_{CREATE|EXTRACT} subcommandsCristian Adam2020-03-1623-0/+507
| | | | | | | | Fixes: #20443
* | Merge topic 'property-computer'Brad King2020-03-173-19/+23
|\ \ | | | | | | | | | | | | | | | | | | fad0ee5404 cmTargetPropertyComputer::GetProperty: return cmProp Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4482
| * | cmTargetPropertyComputer::GetProperty: return cmPropVitaly Stakhovsky2020-03-163-19/+23
| | |
* | | Merge topic 'prop_t'Brad King2020-03-1712-28/+35
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 60f57d0dcc cmPropertyMap: Introduce cmProp as return type for GetProperty() functions Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4471
| * | | cmPropertyMap: Introduce cmProp as return type for GetProperty() functionsVitaly Stakhovsky2020-03-1312-28/+35
| | |/ | |/| | | | | | | | | | | | | | | | Currently properties are usually stored internally as `std::string`. However, family of GetProperty() functions return them as `const char *` using `c_str()`. The proposed `cmProp`, typedef'ed as `const std::string *` will expose properties more naturally.
* | | Merge topic 'mf_profiling_json'Brad King2020-03-171-7/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 897af4c266 cmMakefileProfilingData: Fix ambiguous conversion to Json::Value Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4479
| * | | cmMakefileProfilingData: Fix ambiguous conversion to Json::ValueRaul Tambre2020-03-161-7/+8
| | | |
* | | | Merge branch 'release-3.17'Brad King2020-03-170-0/+0
|\ \ \ \
| * \ \ \ Merge topic 'FindThreads-doc' into release-3.17Brad King2020-03-171-16/+29
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1502f281dd FindThreads: Improve documentation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4480
* | \ \ \ \ Merge topic 'FindThreads-doc'Brad King2020-03-171-16/+29
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 1502f281dd FindThreads: Improve documentation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4480
| * | | | | FindThreads: Improve documentationRolf Eike Beer2020-03-161-16/+29
| | | | | | | | | | | | | | | | | | | | | | | | Issue: #19823
* | | | | | CMake Nightly Date StampKitware Robot2020-03-171-1/+1
| |_|_|_|/ |/| | | |
* | | | | Merge topic 'define-property'Brad King2020-03-168-39/+35
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 73d52a862b cmPropertyDefinition: Construct directly in defined state Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4470
| * | | | | cmPropertyDefinition: Construct directly in defined stateVitaly Stakhovsky2020-03-138-39/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move `cmPropertyDefinitionMap::DefineProperty` functionality directly into the constructor to avoid an intermediate state.
* | | | | | Merge topic 'gtest-parallel-xml'Brad King2020-03-167-1/+91
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 32bc6aa9b6 GoogleTest: Add release note for XML_OUTPUT_DIR 0001339a6f GoogleTest: Add test case for XML_OUTPUT_DIR e9ab39eb1d GoogleTest: Add XML_OUTPUT_DIR parameter Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4433
| * | | | | | 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 'remove_trailing_whitespace'Brad King2020-03-161-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 67a592583d Source: Remove trailing whitespace from export generation code Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4474
| * | | | | | | Source: Remove trailing whitespace from export generation codeAlexandru Croitor2020-03-131-1/+1
| | | | | | | |
* | | | | | | | Merge topic 'gnu-as'Brad King2020-03-1611-1/+67
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9728839b9e ASM: Fix executable link lines with GNU 'as' tool as CMAKE_ASM_COMPILER 5932f0be4f ASM: Fix depfile flags for GNU 'as' tool 0d0aa98c84 ASM: Record vendor-specific output matched to identify assembler ee3ec27465 CMakeDetermineCompilerId: Set locale to C for vendor output match Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4460
| * | | | | | | | ASM: Fix executable link lines with GNU 'as' tool as CMAKE_ASM_COMPILERBrad King2020-03-131-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The GNU `as` tool does not know how to drive linking like the C compiler does. When using `as` as the compiler, use the linker directly.
| * | | | | | | | ASM: Fix depfile flags for GNU 'as' toolBrad King2020-03-138-1/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The GNU `as --help` shows `--MD <file>` as an option to generate depfiles as needed by Ninja. There is no `-MT <target>` flag but fortunately the generated files automatically account for the `-o <obj>` flag. Issue: #20426
| * | | | | | | | ASM: Record vendor-specific output matched to identify assemblerBrad King2020-03-123-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For example, with GNU `as`, we match `GNU assembler`, but with GNU `gcc` as the assembler, we do not match anything. Distinguishing these cases may be useful for constructing assembler command lines.
| * | | | | | | | CMakeDetermineCompilerId: Set locale to C for vendor output matchBrad King2020-03-121-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apply the change from commit d751d2d2ed (CMakeDetermineCompilerABI: set locale to C for try_compile(), 2019-01-14, v3.14.0-rc1~108^2~1) to the `CMAKE_DETERMINE_COMPILER_ID_VENDOR` implementation too.
* | | | | | | | | Merge topic 'FindRuby-typo'Brad King2020-03-161-5/+21
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ffa08d256f FindRuby: Fix compatibility with upper-case cache variables 50c97e1da0 FindRuby: Fix name of Ruby_LIBRARY variable Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4476
| * | | | | | | | FindRuby: Fix compatibility with upper-case cache variablesBrad King2020-03-131-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit e672db628b (FindRuby: Rename variables to match case of module name, 2020-03-11) compatibility was provided for result variables but not for the cache entries that scripts might set.
| * | | | | | | | FindRuby: Fix name of Ruby_LIBRARY variableBrad King2020-03-131-5/+5
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a typo in the variable name caused by commit e672db628b (FindRuby: Rename variables to match case of module name, 2020-03-11).
* | | | | | | | CMake Nightly Date StampKitware Robot2020-03-161-1/+1
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2020-03-151-1/+1
| | | | | | | |
* | | | | | | | Merge topic 'help-source-developer-guide'Marc Chevrier2020-03-141-4/+140
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a4ca1792f6 Help: Update CMake source developer guide for C++ standard library usage Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Daniel Pfeifer <daniel@pfeifer-mail.de> Merge-request: !4467
| * | | | | | | | Help: Update CMake source developer guide for C++ standard library usageMarc Chevrier2020-03-141-4/+140
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We now offer many C++14, C++17, C++20, and custom extensions to the C++ standard library that are available even when compiling as C++11.
* | | | | | | | | CMake Nightly Date StampKitware Robot2020-03-141-1/+1
| |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge topic 'FindRuby-variable-case'Brad King2020-03-133-158/+193
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e672db628b FindRuby: Rename variables to match case of module name Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Frank Dana <ferdnyc@gmail.com> Merge-request: !4463
| * | | | | | | | FindRuby: Rename variables to match case of module nameJulien Marrec2020-03-113-158/+193
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use recommended case for variable names, i.e. matching name of the module as passed to `find_package`. For backwards compatibility, the upper case versions of both input and output variables are used and defined when appropriate. Skip this for the _FOUND variable because FPHSA already does it. This follows the approach from commit a7b09e7f43 (FindProtobuf: Rename variables to match case of module name, 2016-03-01, v3.6.0-rc1~273^2). Issue: #20370
* | | | | | | | Merge topic 'swift-implicit-module-include-dir'Brad King2020-03-135-0/+113
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2026915f8f Swift: Propagate Swift_MODULE_DIRECTORY as include directory Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4320
| * | | | | | | | Swift: Propagate Swift_MODULE_DIRECTORY as include directorySaleem Abdulrasool2020-03-125-0/+113
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach include directory computation for Swift to implicitly propagate the `Swift_MODULE_DIRECTORY` of all linked targets as include directories. This is required to ensure that the swiftmodule of a linked target is accessible to the compiler of the current target. Fixes: #19272
* | | | | | | | | Merge topic 'profiling'Brad King2020-03-1320-2/+304
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9aa4640792 cmake: add command line options to output script profiling data Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Acked-by: Pavel Solodovnikov <hellyeahdominate@gmail.com> Acked-by: Leonid Pospelov <pospelovlm@yandex.ru> Acked-by: Cristian Adam <cristian.adam@gmail.com> Merge-request: !2760
| * | | | | | | | cmake: add command line options to output script profiling dataWouter Klouwen2020-03-0720-2/+304
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For users of CMake who want to optimize their scripts if they take a while to run, this commit adds the ability to output profiling data. To enable this output, it adds the two command line parameters to select the output path and format. This commit adds the first profiling format of type ``google-trace``, which is the output is a JSON file containing Duration events as per the Google Trace Format specification: https://docs.google.com/document/d/1CvAClvFfyA5R- PhYUmn5OOQtYMH4h6I0nSsKchNAySU/preview#
* | | | | | | | | 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)