summaryrefslogtreecommitdiffstats
path: root/Tests
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'fileApiAddPrecompileHeadersBacktrace'Brad King2020-05-2510-6/+664
|\ | | | | | | | | | | | | | | | | | | 9f6d40ee23 fileapi: Extend codemodel targets with PRECOMPILE_HEADERS b698764a31 Tests: Add a PCH example to RunCMake.FileAPI codemodel-v2 b3812c0e54 Tests: Fix indentation in RunCMake.FileAPI cxx_exe.json 9c48804b69 PCH: Fix source group of per-architecture PCH headers Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4684
| * fileapi: Extend codemodel targets with PRECOMPILE_HEADERSJustin Goshi2020-05-226-2/+171
| |
| * Tests: Add a PCH example to RunCMake.FileAPI codemodel-v2Justin Goshi2020-05-228-2/+491
| |
| * Tests: Fix indentation in RunCMake.FileAPI cxx_exe.jsonBrad King2020-05-221-2/+2
| |
* | Merge topic 'ninja-multi-install'Brad King2020-05-253-1/+75
|\ \ | | | | | | | | | | | | | | | | | | dddb4f02f7 Ninja Multi-Config: Make "install" targets depend on default configs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4778
| * | Ninja Multi-Config: Make "install" targets depend on default configsKyle Edwards2020-05-223-1/+75
| | | | | | | | | | | | | | | | | | And add an "install:all" target. Fixes: #20713
* | | Merge topic 'fortran-preprocess-property'Brad King2020-05-229-0/+69
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3888de23da Ninja: Skip Fortran preprocessing if Fortran_PREPROCESS is OFF 66c4e87282 Ninja: Add helper functions to generate Fortran build 5cca1ec893 Ninja: Add helper functions to generate Fortran preprocess rule b0a6161190 Fortran: Add Fortran_PREPROCESS property Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4659
| * | | Ninja: Skip Fortran preprocessing if Fortran_PREPROCESS is OFFPeter Hill2020-05-211-24/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If `Fortran_PREPROCESS` is explicitly turned off for a source file then we know it does not need to be preprocessed. Teach the Ninja generator to skip preprocessing in this case. Otherwise we still must preprocess just in case. Fixes: #18870
| * | | Fortran: Add Fortran_PREPROCESS propertyPeter Hill2020-05-219-0/+71
| | | | | | | | | | | | | | | | Issue: #18870
* | | | Merge topic 'cmake_language-rename-from-cmake_command'Craig Scott2020-05-2282-86/+85
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 94c1e4fdb3 cmake_language: Rename command from cmake_command Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4774
| * | | | cmake_language: Rename command from cmake_commandBrad King2020-05-2182-86/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also rename the `INVOKE` signature to `CALL`. Fixes: #20732
* | | | | Merge topic 'support_conda_env'Brad King2020-05-223-1/+19
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 50879ce412 Conda: Add CONDA_PREFIX as an acceptable system prefix path cd9c3c000f Tests: Update QtAutogen codeeditor test only include headers needed d806bd2e8c Tests: Update test suite to run in an Anaconda environment Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4773
| * | | | | Tests: Update QtAutogen codeeditor test only include headers neededRobert Maynard2020-05-211-1/+4
| | | | | |
| * | | | | Tests: Update test suite to run in an Anaconda environmentRobert Maynard2020-05-212-0/+15
| | | | | |
* | | | | | Merge topic 'cuda-default-runtime'Brad King2020-05-223-0/+22
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d8eee80e30 Merge branch 'backport-cuda-default-runtime' into cuda-default-runtime e55b21e24e CUDA: Compute CMAKE_CUDA_RUNTIME_LIBRARY default from toolchain 1086e930dc CUDA: Propagate CMAKE_CUDA_RUNTIME_LIBRARY state to try_compile a4ea293153 Help: Correct CMAKE_CUDA_RUNTIME_LIBRARY applicability Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4762
| * | | | | Merge branch 'backport-cuda-default-runtime' into cuda-default-runtimeBrad King2020-05-223-0/+22
| |\ \ \ \ \
| | * | | | | CUDA: Compute CMAKE_CUDA_RUNTIME_LIBRARY default from toolchainRobert Maynard2020-05-213-0/+21
| | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 0d0145138f (CUDA: Add abstraction for cuda runtime selection, 2019-11-29, v3.17.0-rc1~83^2) we add CUDA runtime library selection flags by default. To maintain backwards compatibility the default CUDA runtime library needs to be computed based on what libraries are found on the initial compiler invocation. For example a toolchain could establish initial flags that have all CUDA compilations using the runtime version, and if we don't detect this we will try to link to both the static and shared runtime. Co-Author: Brad King <brad.king@kitware.com> Fixes: #20708
| | * | | | Merge topic 'fix-cache-args-file-to-dep-list' into release-3.17Brad King2020-05-137-0/+48
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0199dd9f1b ExternalProject: expose _ep_cache_args_script to the caller Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4710
| | * \ \ \ \ Merge topic 'vs-pch-compile-opts' into release-3.17Brad King2020-05-121-0/+3
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6b2fb4ffd2 VS: Fix using PCH from source with COMPILE_OPTIONS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4734
* | | \ \ \ \ \ Merge topic 'cmake_command_invoke_expand_function_name'Brad King2020-05-2121-0/+57
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aa55587094 cmake_command: Expand INVOKE function name argument Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4750
| * | | | | | | cmake_command: Expand INVOKE function name argumentCristian Adam2020-05-1921-0/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #20707
* | | | | | | | Merge topic 'cuda-test-nvcc-restore'Brad King2020-05-205-5/+5
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4c7cc264af Tests: Restore NVCC-specific CUDA tests Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4768
| * | | | | | | Tests: Restore NVCC-specific CUDA testsBrad King2020-05-205-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit a653ca9504 (Tests: Update CUDA tests to work with Clang, 2020-03-27) some tests were conditioned using `CMAKE_CUDA_COMPILER_ID`. That is not defined when configuring CMake itself, so it accidentally turned off NVCC-specific CUDA tests altogether. Convert the conditions to check `CMake_TEST_CUDA` for `Clang` instead. That option is added explicitly to builds where we want the tests to run, so we can set it to a value indicating the CUDA compiler vendor. In commit a653ca9504 (Tests: Update CUDA tests to work with Clang, 2020-03-27) the NVCC-specific `CudaOnly.GPUDebugFlag` test was accidentally broken by removing a space when appending `-G` to the CUDA flags. This was covered by the test not running. Restore the space. Fixes: #20727
* | | | | | | | Merge topic 'ctest-log-environment'Brad King2020-05-205-0/+40
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a1612af749 CTest: Log environment variables as a test measurement Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4760
| * | | | | | | | CTest: Log environment variables as a test measurementKyle Edwards2020-05-195-0/+40
| | | | | | | | |
* | | | | | | | | Merge topic 'src-named-for-config'Brad King2020-05-191-0/+7
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 70c85c1d6f Tests: Add case for source files named with CONFIG genex 3b547e2e4b VS: Simplify logic adding source file C/C++ language flag to MSVC 27ead9d4b7 VS: Compute managed type from an existing configuration 1222327c89 VS: Write custom commands for sources from all configurations 65fe58a4b4 cmVisualStudio10TargetGenerator: Adopt Windows Store and Phone infrastructure 3fa3b7a402 cmGeneratorTarget: Remove default config from Get* methods d6a88d2158 cmTarget: Replace "perConfig" constructor boolean with enum Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4761
| * | | | | | | | | Tests: Add case for source files named with CONFIG genexBrad King2020-05-181-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is now expected to work on all generators where the test runs. Recent ancestors of this commit fix the Visual Studio generator. Fixes: #20648
* | | | | | | | | | Merge topic 'add_test-special-chars-in-name'Brad King2020-05-1956-6/+373
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f84af8e270 add_test: Allow special characters in test name Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4754
| * | | | | | | | | add_test: Allow special characters in test nameDeniz Bahadir2020-05-1756-6/+373
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #19391
* | | | | | | | | | Merge topic 'fetchcontent-SOURCE_SUBDIR'Brad King2020-05-183-2/+17
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 592085b94b FetchContent: Add support for SOURCE_SUBDIR Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4757
| * | | | | | | | | FetchContent: Add support for SOURCE_SUBDIRCraig Scott2020-05-163-2/+17
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | Fixes: #19875
* | | | | | | | | Merge topic 'cuda-clang'Brad King2020-05-1812-48/+70
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a653ca9504 Tests: Update CUDA tests to work with Clang 5df21adf46 CUDA: Add support for Clang compiler dc2eae1f91 FindCUDAToolkit: Factor out discovery code into a separate file 70be10cbf4 CUDA: Remove toolkit include dirs from implicit include dirs only with NVIDIA Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Artem Belevich <tra@google.com> Acked-by: Robert Maynard <robert.maynard@kitware.com> Acked-by: Axel Huebl <axel.huebl@plasma.ninja> Acked-by: friendnick <ikoval67@gmail.com> Acked-by: Patrik Huber <patrikhuber@gmail.com> Merge-request: !4442
| * | | | | | | | | Tests: Update CUDA tests to work with ClangRaul Tambre2020-05-1512-48/+70
| |/ / / / / / / /
* | | | | | | | | Merge topic 'fix-CheckTargetsForMissingSources'Brad King2020-05-181-0/+14
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 25995b2b30 cmGlobalGenerator: Fix CheckTargetsForMissingSources after refactoring Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4747
| * | | | | | | | cmGlobalGenerator: Fix CheckTargetsForMissingSources after refactoringBrad King2020-05-151-0/+14
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring in commit 01b2d6ab74 (Modernize: Use ranged for-loops when possible, 2019-02-07, v3.15.0-rc1~575^2) accidentally changed a loop condition in this method from "keep iterating if srcs.empty()" to "stop iterating if srcs.empty()". Switch it back. The bug could only manifest in very subtle conditions in a multi-config generator. Add one such case to the test suite. Fixes: #20706
* | | | | | | | FindDoxygen: Prevent tests from interfering with each otherCraig Scott2020-05-161-0/+2
| |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | When doing something like ctest -j8, the FindDoxygen.SimpleTest test case would execute multiple doxygen sub-tests that then try to create/write to the same output directory.
* | | | | | | Merge topic 'source_file_scopes'Brad King2020-05-1510-0/+274
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3d4b70ea64 set_source_files_properties: Allow specification of directory scope Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4661
| * | | | | | set_source_files_properties: Allow specification of directory scopeAlexandru Croitor2020-05-1410-0/+274
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Both set_source_files_properties() and set_property(SOURCE) now accept two new optional arguments: DIRECTORY and TARGET_DIRECTORY. The DIRECTORY option takes a list of relative or absolute paths pointing to processed source directories (add_subdirectory was already called on them). These paths specify directory scopes where the source file properties will be set. Previously the scope was always the currently processed source directory. Similarly TARGET_DIRECTORY takes a list of targets, whose source directories will be used as the list of scopes where to set the source file properties. get_property() and get_source_file_property() also get the same new arguments, except only one value can be specified instead of a list. Fixes: #20128
* | | | | | | Merge topic 'tests-Wstrict-prototypes'Brad King2020-05-143-3/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4150a18910 Tests: Fix -Wstrict-prototypes warnings in some C sources Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4744
| * | | | | | | Tests: Fix -Wstrict-prototypes warnings in some C sourcesBrad King2020-05-133-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some RunCMake tests fail with this warning due to extra stderr content: warning: this old-style function definition is not preceded by a prototype Convert `foo()` to `foo(void)` in `.c` sources of affected tests.
* | | | | | | | Merge topic 'cmake_command_preserve_args'Brad King2020-05-143-0/+19
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 549599bf32 cmake_command: Preserve arguments to INVOKE function Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4741
| * | | | | | | | cmake_command: Preserve arguments to INVOKE functionCristian Adam2020-05-123-0/+19
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | Fixes: #20630
* | | | | | | | Merge topic 'interface-sources-multi-config'Brad King2020-05-132-1/+46
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6c5d4522bc INTERFACE_SOURCES: Fix per-config link libs on multi-config generators 8daa140c6a cmGeneratorTarget: Factor evaluated target prop entries into struct fcd1a1a920 cmGeneratorTarget: Track when the set of link libs is config-dependent Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4740
| * | | | | | | | INTERFACE_SOURCES: Fix per-config link libs on multi-config generatorsBrad King2020-05-122-1/+46
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In multi-config generators we memoize the computed set of source files for a target to avoid repeating the computation when the set does not depend on the configuration. We already track whether generator expressions in `SOURCES` or `INTERFACE_SOURCES` reference the configuration (`$<CONFIG:...>`). However, we previously forgot to track whether the set of libraries whose `INTERFACE_SOURCES` are considered depends on the configuration. This caused multi-config generators to use the first configuration's set of sources for all configurations in cases such as target_link_libraries(tgt PRIVATE $<$<CONFIG:Debug>:iface_debug>) where the `iface_debug` target has `INTERFACE_SOURCES`. Fix this by also tracking config-dependence of the list of libraries for evaluation of the list of source files. Fixes: #20683
* | | | | | | | Merge topic 'fix-cache-args-file-to-dep-list'Brad King2020-05-137-0/+48
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | / / / | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | 0199dd9f1b ExternalProject: expose _ep_cache_args_script to the caller Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4710
| * | | | | | ExternalProject: expose _ep_cache_args_script to the callerBen Boeckel2020-05-127-0/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is needed so that the caller can add a dependency on the cache file. Fixes: #20668
* | | | | | | Initialize CMAKE_EXPORT_COMPILE_COMMANDS only if not set alreadyBrad King2020-05-127-0/+17
| |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also de-duplicate its initialization code. Fixes: #16588
* | | | | | Merge topic 'vs-pch-compile-opts'Brad King2020-05-121-0/+3
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 6b2fb4ffd2 VS: Fix using PCH from source with COMPILE_OPTIONS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4734
| * | | | | VS: Fix using PCH from source with COMPILE_OPTIONSBrad King2020-05-111-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a source file gets per-source flags from both PCH and custom `COMPILE_OPTIONS`, combine them correctly. Fixes: #20694, #20456
* | | | | | Merge topic 'doxygen-generated-sources'Brad King2020-05-111-5/+24
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5ec9690802 FindDoxygen: Allow generated files with USE_STAMP_FILE 683abe4366 FindDoxygen: Formatting-only indentation cleanup for test case Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4726