summaryrefslogtreecommitdiffstats
path: root/Tests/RunCMake
Commit message (Collapse)AuthorAgeFilesLines
* Revise include order using clang-format-6.0Kitware Robot2019-10-014-6/+9
| | | | | Run the `clang-format.bash` script to update our C and C++ code to a new include order `.clang-format`. Use `clang-format` version 6.0.
* Tests: Cover EXCLUDE_FROM_ALL OFF on sub/sub/tgt in sub/allBrad King2019-09-304-0/+5
| | | | Issue: #19753
* Ninja,Makefile: Fix subdir "all" with nested EXCLUDE_FROM_ALL subdirBrad King2019-09-306-0/+10
| | | | | | | | | | The "all" target defined for a subdirectory (e.g. `cd sub; make` or `ninja sub/all`) should not include the "all" targets from nested subdirectories (e.g. `sub/sub`) that are marked as `EXCLUDE_FROM_ALL`. Fix this and add a test case. Issue: #19753 Co-Author: Sebastian Holtermann <sebholt@xwmw.org>
* Merge topic 'fix-EXCLUDE_FROM_ALL-subdir-all'Brad King2019-09-309-66/+120
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | dce58afd30 Merge branch 'backport-3.15-fix-EXCLUDE_FROM_ALL-subdir-all' 013d7dd484 Help: Mention 3.14.7 EXCLUDE_FROM_ALL fix in 3.15.4 release note 61103c0bac Merge branch 'backport-3.14-fix-EXCLUDE_FROM_ALL-subdir-all' 1fe4501592 Help: Add release note for EXCLUDE_FROM_ALL fix in 3.15.4 05d7ca14e9 Merge branch 'backport-3.14-fix-EXCLUDE_FROM_ALL-subdir-all' 62d45d91e8 Help: Add release note for EXCLUDE_FROM_ALL fix in 3.14.7 b3b1c7bf3a Restore "all" target in subdirectories marked EXCLUDE_FROM_ALL 156b56480a Makefiles: Revert "Make build root targets ... recursive" ... Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3863
| * Merge branch 'backport-3.15-fix-EXCLUDE_FROM_ALL-subdir-all'Brad King2019-09-309-66/+120
| |\ | | | | | | | | | | | | | | | | | | | | | Resolve conflicts with changes since the 3.15 series: * Convert `cmSystemTools::IsOn` => `cmIsOn`. * Move one "EXCLUDE_FROM_ALL" target property logic fix to its new location in `cmMakefile::AddNewUtilityTarget`.
| | * Merge branch 'backport-3.14-fix-EXCLUDE_FROM_ALL-subdir-all'Brad King2019-09-309-66/+120
| | |\
| | | * Restore "all" target in subdirectories marked EXCLUDE_FROM_ALLBrad King2019-09-307-2/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "all" target in each directory is supposed to have targets from that directory even if the directory itself is marked `EXCLUDE_FROM_ALL` in its parent. This was broken by commit dc6888573d (Pass EXCLUDE_FROM_ALL from directory to targets, 2019-01-15, v3.14.0-rc1~83^2) which made the participation of a target in "all" independent of context. Revert much of the logic change from that commit to restore the old behavior. Then re-implement the behavior intended by the commit to keep its test working. Extend the test to cover the old behavior too. Fixes: #19753
| | | * Tests: Clarify target names in RunCMake.add_subdirectory ExcludeFromAllBrad King2019-09-264-6/+9
| | | | | | | | | | | | | | | | | | | | Rename the `baz` target to `subinc` to clarify that its role is to be included even though it is in an otherwise excluded subdirectory.
| | | * Tests: Revise RunCMake.add_subdirectory ExcludeFromAll to avoid globbingBrad King2019-09-264-61/+43
| | | | | | | | | | | | | | | | Also simplify the clean step.
| | | * Tests: Teach RunCMake to support a custom working directoryBrad King2019-09-241-1/+4
| | | |
| | * | Merge branch 'FindBoost-1.71' into release-3.15Brad King2019-08-301-0/+5
| | |\ \ | | | | | | | | | | | | | | | Merge-request: !3763
| | * \ \ Merge branch 'backport-find-no-name' into release-3.15Brad King2019-08-283-0/+4
| | |\ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !3751
* | | \ \ \ Merge topic 'FPHSA-reason-failure-message'Brad King2019-09-3013-0/+70
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 60473cc660 FPHSA: add capability to specify message explaining reason of failure Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3866
| * | | | | FPHSA: add capability to specify message explaining reason of failureMarc Chevrier2019-09-2713-0/+70
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: #19660
* | | | | | fileapi: add some source property backtracesJustin Goshi2019-09-262-4/+62
|/ / / / / | | | | | | | | | | | | | | | | | | | | Support backtraces for COMPILE_DEFINITIONS, COMPILE_OPTIONS, and INCLUDE_DIRECTORIES source properties.
* | | | | Merge topic 'fix-vsmacro-access-violation'Brad King2019-09-267-1/+28
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7847fef510 VS: Fix access violation when calling Visual Studio macro Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3853
| * | | | | VS: Fix access violation when calling Visual Studio macroDaniel Eiband2019-09-247-1/+28
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: #19730
* | | | | | Merge topic 'add-custom-target-byproduct-checks'Brad King2019-09-2612-4/+136
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fd3a394614 add_custom_command: Format files in error message in a single line a1cc6b4447 add_custom_target: Add output checks for custom target byproducts cbb861ade8 add_custom_command: Add tests for custom command output checks Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3850
| * | | | | | add_custom_command: Format files in error message in a single lineDaniel Eiband2019-09-234-4/+4
| | | | | | |
| * | | | | | add_custom_target: Add output checks for custom target byproductsDaniel Eiband2019-09-235-11/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the output checks for byproducts of add_custom_command also for byproducts of add_custom_target.
| * | | | | | add_custom_command: Add tests for custom command output checksDaniel Eiband2019-09-237-0/+88
| |/ / / / /
* | | | | | Merge topic 'cpack-DEB-use-CPACK_PACKAGE_DESCRIPTION_FILE'Kyle Edwards2019-09-266-3/+140
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 33c7ea513d CPackDeb: Use `CPACK_PACKAGE_DESCRIPTION_FILE` 53be31e19c Refactor: Use `list` commands instead of old-way string ops b2c67a7703 Style: Remove spaces after command call and `(` Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3541
| * | | | | | CPackDeb: Use `CPACK_PACKAGE_DESCRIPTION_FILE`Alex Turbov2019-09-216-3/+140
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, handle per-component description nicely.
* | | | | | | Precompile headers: Treat headers as relative to current source directoryCristian Adam2019-09-236-13/+22
| |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach `target_precompile_headers` to treat relative paths the same way as `target_sources`. Fixes: #19733
* | | | | | Merge topic 'split-custom-command-creation'Brad King2019-09-2014-0/+42
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0e1faa28cb cmMakefile: Separate custom command setup from actual creation 56c204e8eb cmMakefile: Refactor AddCustomCommandOldStyle to be delay friendly 3061dc6ac9 add_custom_command: Add tests for rejecting literal quotes in commands e893ab94ba cmMakefile: Validate command line for all custom commands f1e846fdde cmMakefile: Extract custom command validation method 4926ab2454 cmMakefile: Create all generated byproducts as known sources Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3822
| * | | | | | add_custom_command: Add tests for rejecting literal quotes in commandsDaniel Eiband2019-09-1714-0/+42
| | | | | | |
* | | | | | | Merge topic 'fileapiLinkPathAndLinkDirBacktraces'Brad King2019-09-202-2/+39
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4d6334824d fileapi: add backtraces for LINK_PATH and LINK_DIRECTORIES 5bd65dff7a cmLocalGenerator: Add OutputLinkLibraries overload with backtraces 5d39e792ae cmGeneratorTarget: Store backtrace for target LINK_DIRECTORIES property 7da17ef797 cmLinkLineComputer: Add ComputeLinkLibraries overload with backtraces d4d0dd0f6a cmLinkLineComputer: Add ComputeLinkLibs overload with backtraces 0ac9dcb807 cmLinkLineComputer: Add ComputeLinkPath overload with backtraces 0c6468178a cmComputeLinkInformation: Add GetDirectoriesWithBacktraces a209b31d0d cmComputeLinkInformation: Add AppendValues with backtraces Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3805
| * | | | | | | fileapi: add backtraces for LINK_PATH and LINK_DIRECTORIESJustin Goshi2019-09-182-2/+39
| | | | | | | |
* | | | | | | | Merge topic 'shared-pch'Brad King2019-09-187-1/+49
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 729d997f10 Precompile Headers: Add REUSE_FROM signature Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Rickard Englund <rickard@r-englund.com> Acked-by: Viktor Kirilov <vik.kirilov@gmail.com> Merge-request: !3762
| * | | | | | | Precompile Headers: Add REUSE_FROM signatureCristian Adam2019-09-177-1/+49
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the ability to share precompiled headers artifacts between targets. Fixes: #19659
* | | | | | | Merge topic 'byproduct-collapse-full-path'Brad King2019-09-174-0/+26
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3b409643bd Byproducts: Add test for collapsing of full paths in byproducts 445ff5ccdf Byproducts: collapse full paths of custom target byproducts Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3804
| * | | | | | | Byproducts: Add test for collapsing of full paths in byproductsDaniel Eiband2019-09-164-0/+26
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add test for collapsing of full paths in byproducts and additional tests for the GENERATED source file properties set by add_custom_command and add_custom_target with relative paths.
* | | | | | | Merge topic 'allow-pkg-config-missing-libraries'Brad King2019-09-171-33/+16
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 28cb86d796 FindPkgConfig: Allow libraries that can't be found with their full path Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Rolf Eike Beer <eike@sf-mail.de> Merge-request: !3781
| * | | | | | FindPkgConfig: Allow libraries that can't be found with their full pathChuck Atkins2019-09-161-33/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pkg-config's .pc files can sometimes provide libraries that are visible to the linker but not present in CMake's known search paths. In the case where CMake can find some, but not all of the library dependencies provided in a .pc file, this allows them to be passed through as "-lfoo" when the full path can't be found. This also removes the test failure cases that occured because of this scenario and adjsuts the remaining tests to account for not-found libraries
* | | | | | | Merge topic 'fileapiAddMoreBacktraces'Brad King2019-09-112-4/+129
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 30006e199b fileapi: add backtraces for compile/link options 291c83f063 cmLocalGenerator: Add GetTargetCompileFlags overload with backtraces 8e973b8e8d cmLocalGenerator: Add GetTargetFlags overload with backtraces 4d5bbb7704 cmLocalGenerator: Add GetStaticLibraryFlags overload with backtraces 1f6a436bf4 cmLocalGenerator: Add AddCompileOptions overload with backtraces 5355a60fd0 cmLocalGenerator: Add AppendCompileOptions overload with backtraces a20d2c85d0 cmLocalGenerator: Add AppendFlags overload with backtraces b13207910e cmLocalGenerator: Clarify AddCompileOptions filter logic ... Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3775
| * | | | | | | fileapi: add backtraces for compile/link optionsJustin Goshi2019-09-102-4/+129
| | |/ / / / / | |/| | | | |
* | | | | | | Windows: Prevent auto exports to be regenerated on every buildDaniel Eiband2019-09-092-3/+34
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check modified time stamps of input files against an existing exports file before generating the auto exports. Fixes: #19650
* | | | | | Merge topic 'unity-build'Brad King2019-09-0530-0/+388
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7786a05c70 Unity build: Add XCode support 1353802af3 Unity build: Add unit tests 8dfeb5d278 Unity build: Add support for Visual Studio generator 7114c141e2 Unity build: Add support for Ninja and Makefile generators Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Stanislav Ershov <digital.stream.of.mind@gmail.com> Acked-by: Evgeniy Dushistov <dushistov@mail.ru> Acked-by: Viktor Kirilov <vik.kirilov@gmail.com> Merge-request: !3611
| * | | | | Unity build: Add unit testsCristian Adam2019-08-3030-0/+388
| | | | | |
* | | | | | Merge topic 'pch-fix-vs-test'Brad King2019-09-041-11/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 383bf3b5e7 Precompile Headers: Fix Visual Studio 10 unit test Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3770
| * | | | | | Precompile Headers: Fix Visual Studio 10 unit testCristian Adam2019-09-031-11/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The unit test is more roboust, problems like c: vs C: or having relative paths of cmake_pch.cxx instead of absolute paths.
* | | | | | | Merge topic 'vs-cuda-custom-dir'Brad King2019-09-037-7/+23
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 25f29b9741 cuda: Adapted tests to work with modified cuda toolset ee86770a3f cuda: Added docs for extended cuda toolset 0ad180d712 cuda: Extend cuda compiler detection to work with custom cuda path 55b0532128 cuda: Extend vs10 target generator to use custom cuda path df0247a371 cuda: Extend toolset argument to accept path Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3713
| * | | | | | | cuda: Adapted tests to work with modified cuda toolsetBenjamin Wozniak2019-08-307-7/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - cuda version is only recognized if it contains no other characters than "0123456789." - cuda path is only tested with dummy value . Otherwise a cuda toolkit must be copied to the integration test machine
* | | | | | | | Merge topic 'FindPkgConfig-module-name'Brad King2019-09-032-0/+29
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fe68387695 FindPkgConfig: return the module found by pkg_search_module Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3749
| * | | | | | | | FindPkgConfig: return the module found by pkg_search_moduleChristophe Giboudeaux2019-08-292-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When running `pkg_search_module`, it may be useful to get the matching module name in order to run `pkg_get_variable`. `pkg_search_module` now defines `<prefix>_MODULE_NAME` which contains the first matching module name. Fixes: #19648
* | | | | | | | | Merge topic 'cpack-install-multiple-configurations'Brad King2019-09-034-0/+18
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | da5ac4bb60 cpack: Add `CPACK_INSTALL_CMAKE_CONFIGURATIONS` variable d4e6b2ae25 Refactor: Use `unique_ptr` instead of raw pointer Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3533
| * | | | | | | | | cpack: Add `CPACK_INSTALL_CMAKE_CONFIGURATIONS` variableAlex Turbov2019-08-304-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For the multi-configuration generators one can specify the list of configurations to include in the package. E.g. having a project, where debug libraries have a suffix to distinct them from the release builds, one can build the package containing both `Debug` and `Release` binaries.
* | | | | | | | | | Merge topic 'FindBoost-1.71'Brad King2019-09-031-0/+5
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | / / | | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7828577065 FindBoost: Add support for Boost 1.71 cf29fa18c8 FindBoost: Unwrap compatibility INTERFACE targets for legacy variables d7df3cd73f FindBoost: Remove incorrect 1.70 timer dependency 8ff43de1a5 FindBoost: Simplify conditional block for last known version Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Dennis Klein <d.klein@gsi.de> Merge-request: !3763
| * | | | | | | | FindBoost: Unwrap compatibility INTERFACE targets for legacy variablesBrad King2019-08-301-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 0dd6772a89 (FindBoost: Add legacy variables and targets for compatibility, 2019-06-14, v3.15.0-rc2~3^2~1) we extract information from imported targets provided by upstream `BoostConfig.cmake` files. However, upstream Boost 1.71 provides some imported targets only for compatibility. They are just INTERFACE libraries that wrap around the real target named by `INTERFACE_LINK_LIBRARIES`. Unwrap this layer so we can extract the real imported location. Fixes: #19656
* | | | | | | | | Merge topic 'remove_directory-symlink'Brad King2019-08-305-0/+23
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e6c9a8bac3 cmake: Teach -E remove_directory to remove directory symlinks Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3738
generated by cgit v0.12 at 2025-01-24 10:36:37 (GMT)