summaryrefslogtreecommitdiff
path: root/Tests
Commit message (Collapse)AuthorAgeFilesLines
* VS: Test VS_SETTINGS and VS_SOURCE_SETTINGS_<tool> properties.Matt Davies2020-03-269-1/+122
|
* Merge topic 'FindRuby-updates'Brad King2020-03-186-0/+82
|\ | | | | | | | | | | | | | | | | | | | | | | 46064c8193 FindRuby: Add support for versions up to 2.7 675eaf3bd0 FindRuby: Update MSVC runtime library selection b970e25d98 FindRuby: Remove extra whitespace ecdace4d61 FindRuby: Include FPHSA closer to where it is used f52f496138 FindRuby: Provide Ruby_LIBRARIES result variable b00d736a0b FindRuby: Add dedicated tests Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4481
| * FindRuby: Provide Ruby_LIBRARIES result variableBrad King2020-03-161-1/+1
| | | | | | | | | | The `cmake-developer(7)` manual documents that a plural non-cached name should be used for results.
| * FindRuby: Add dedicated testsJulien Marrec2020-03-166-0/+82
| | | | | | | | Issue: #20370
* | Merge topic 'FindPkgConfig-broken-pkg-config'Brad King2020-03-183-0/+12
|\ \ | | | | | | | | | | | | | | | | | | | | | 1c99f5df28 FindPkgConfig: Add test for specified pkg-config tool missing b59f36aad8 FindPkgConfig: Unset results when pkg-config is broken Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4451
| * | FindPkgConfig: Add test for specified pkg-config tool missingBrad King2020-03-173-0/+12
| | |
* | | Merge topic 'FindPython-version-validation-fix'Brad King2020-03-182-15/+67
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | cc7f116cb4 FindPython: fix regression on version validation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4492
| * | | FindPython: fix regression on version validationMarc Chevrier2020-03-172-15/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 3dab4682f6 (FindPython: reduces consumption of resources, 2020-02-10, v3.17.0-rc1~11^2) we accidentally broke the python executable version validation when the "LOCATION" strategy is used with the plain `FindPython` module. Fix the logic and add test cases covering those combinations. Fixes: #20465
| * | | Merge topic 'rename-macho-version-properties' into release-3.17Craig Scott2020-03-121-2/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 14732d3f30 macOS: Rename OSX_*_VERSION properties to MACHO_*_VERSION Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4452
* | \ \ \ Merge topic 'file-archive'Brad King2020-03-1720-0/+229
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1620-0/+229
| | |_|_|/ | |/| | | | | | | | | | | | | Fixes: #20443
* | | | | Merge topic 'gtest-parallel-xml'Brad King2020-03-164-0/+69
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 test case for XML_OUTPUT_DIRAlexander Stein2020-03-134-0/+69
| | | | | |
* | | | | | Merge topic 'gnu-as'Brad King2020-03-167-1/+39
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 depfile flags for GNU 'as' toolBrad King2020-03-137-1/+39
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Merge topic 'FindRuby-variable-case'Brad King2020-03-131-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-111-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-134-0/+29
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-124-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1311-0/+49
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0711-0/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-136-1/+29
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: 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 'rename-macho-version-properties'Craig Scott2020-03-121-2/+2
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| | | | | | | | | | 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-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge topic 'swift-ninja-multiconfig'Kyle Edwards2020-03-103-0/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 87819db28d Merge branch 'backport-swift-ninja-multiconfig' into swift-ninja-multiconfig 65b3848de0 Swift: support Ninja Multi-Config Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4440
| * \ \ \ Merge branch 'backport-swift-ninja-multiconfig' into swift-ninja-multiconfigKyle Edwards2020-03-093-0/+9
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/ | | |/|
| | * | Swift: support Ninja Multi-ConfigSaleem Abdulrasool2020-03-093-0/+9
| | | | | | | | | | | | | | | | | | | | Enable support for multi-configuration builds using Ninja when building Swift.
| | * | Merge topic 'ninja-multi-custom-command-deps' into release-3.17Brad King2020-03-053-6/+3
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 081c4679f7 Ninja Multi-Config: Don't build target dependencies for custom commands Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4423
| | * \ \ Merge topic 'FindPython-manage-SOABI-suffix' into release-3.17Brad King2020-03-041-0/+10
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0c97b73bc0 FindPython: python_add_library can now manage SOABI suffix. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4420
* | | \ \ \ Merge topic 'file-CONFIGURE'Brad King2020-03-1022-0/+89
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a6fee09484 file: Add CONFIGURE subcommand Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4436
| * | | | | | file: Add CONFIGURE subcommandLeander Beernaert2020-03-0922-0/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend the `file()` command with a new `CONFIGURE` subcommand that behaves the same as `string(CONFIGURE)` except that it writes the resulting output immediately to a file. Fixes: #20388
* | | | | | | find_*: Add support for REQUIRED keywordSylvain Joubert2020-03-0620-0/+78
| |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the same spirit as the REQUIRED keyword on find_package, this will stop cmake execution with an error on a failed find_program, find_file, find_path or find_library.
* | | | | | Merge topic 'FindPython-artifacts-scope'Brad King2020-03-063-3/+56
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | e5b4c74238 FindPython: Add possibility to control scope of artifacts. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4426
| * | | | | FindPython: Add possibility to control scope of artifacts.Marc Chevrier2020-03-053-3/+56
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: #20362
* | | | | | Merge topic 'macos_framework_postfix'Kyle Edwards2020-03-053-0/+106
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ad3f69c86e Add support for FRAMEWORK_MULTI_CONFIG_POSTFIX_<CONFIG> Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4289
| * | | | | | Add support for FRAMEWORK_MULTI_CONFIG_POSTFIX_<CONFIG>Alexandru Croitor2020-03-043-0/+106
| | | | | | |
* | | | | | | Merge topic 'objlib-transitive-deps'Brad King2020-03-057-2/+57
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a833aa1167 Fix dependencies on targets linked through object libraries 3b3de0fd17 Tests: Extend ObjectLibrary test with case for object lib dependencies Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4427
| * | | | | | | Fix dependencies on targets linked through object librariesBrad King2020-03-043-2/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When an object library is used via `target_link_libraries`, any targets listed in the object library's `INTERFACE_LINK_LIBRARIES` closure should become direct dependencies of the consuming target. However, these were accidentally left out by `cmComputeTargetDepends::CollectTargetDepends` because object libraries are encountered through external object sources first and then added to the `emitted` set which blocks them from being processed as link dependencies. This was not noticed by the test case in commit bab24e782c (target_link_libraries: Propagate dependencies of object libraries, 2018-12-10, v3.14.0-rc1~260^2) because the relevant dependency appears transitively through the object library target itself. Re-order the logic to process link dependencies first, and then external object sources. That way object libraries used via `target_link_libraries` will be treated as such by dependency analysis. This also adds missing backtrace information for object libraries used via `target_link_libraries`. The missing information was mentioned in a FIXME comment in the RunCMake.FileAPI test added by commit ea0a060168 (fileapi: Add test for codemodel v2, 2018-11-09, v3.14.0-rc1~257^2~7). That comment itself was dropped by commit a0de350e2f (FileAPI test: Break gen_check_targets() into JSON files, 2020-02-07), but we can now update the corresponding location in the `.json` files to have the now-expected backtrace information. Fixes: #20421
| * | | | | | | Tests: Extend ObjectLibrary test with case for object lib dependenciesBrad King2020-03-045-0/+24
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the test case from commit bab24e782c (target_link_libraries: Propagate dependencies of object libraries, 2018-12-10, v3.14.0-rc1~260^2) to the main ObjectLibrary test.
* | | | | | | Merge topic 'ninja-multi-custom-command-deps'Brad King2020-03-053-6/+3
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 081c4679f7 Ninja Multi-Config: Don't build target dependencies for custom commands Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4423
| * | | | | | Ninja Multi-Config: Don't build target dependencies for custom commandsKyle Edwards2020-03-033-6/+3
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If cross-config mode is used, and a target depends on another target as well as a custom command, we don't want the custom command to also depend on the depended target, as that would build targets unnecessarily. Fix this behavior.
* | | | | | Merge topic 'findx11-improvement'Brad King2020-03-051-0/+11
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 77802aab97 FindX11: Find additional libraries Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !4101
| * | | | | FindX11: Find additional librariesZsolt Parragi2020-03-041-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With this change, FindLibrary(X11) learns about the following libraries: * xcb * X11-xcb * xcb-icccm * xcb-xkb * xkbcommon * xkbcommon-X11
* | | | | | Merge topic 'FindPython-manage-SOABI-suffix'Brad King2020-03-041-0/+10
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 0c97b73bc0 FindPython: python_add_library can now manage SOABI suffix. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4420
| * | | | | FindPython: python_add_library can now manage SOABI suffix.Marc Chevrier2020-03-031-0/+10
| | |/ / / | |/| | | | | | | | | | | | | Fixes: #20408
* | | | | Merge topic 'ninja-multi-spurious-unused-variables'Brad King2020-03-042-2/+13
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | 8b799f80e3 Ninja Multi-Config: Fix spurious unused variable warning Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4421
| * | | | Ninja Multi-Config: Fix spurious unused variable warningKyle Edwards2020-03-032-2/+13
| |/ / / | | | | | | | | | | | | Fixes: #20381
| * | | Merge topic 'ninja-multi-variable-shuffle-again' into release-3.17Brad King2020-02-2817-34/+70
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c794b70f19 Ninja Multi-Config: Always generate build.ninja 9590c3a400 Generator: Don't allow Ninja Multi-Config variables on other generators 7a63dafafb Ninja Multi-Config: Remove "NMC" from variable names Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4403
* | \ \ \ Merge topic 'cmake_command-eval'Brad King2020-03-0315-1/+30
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | 598b676b5e cmake_command: Add command to EVAL a CMake script as a string Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4408