summaryrefslogtreecommitdiffstats
path: root/Tests/RunCMake
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'target_link_libraries-self-link-is-an-error'Brad King2020-06-027-0/+26
|\ | | | | | | | | | | | | 9436ad35df target_link_libraries: self-link through ALIAS is an error Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4826
| * target_link_libraries: self-link through ALIAS is an errorMarc Chevrier2020-05-307-0/+26
| | | | | | | | Fixes: #19617
* | Merge topic 'asm-preprocessor-flag'Brad King2020-06-021-0/+1
|\ \ | | | | | | | | | | | | | | | | | | 97fa63c09b ASM: Fix preprocessor definition flags for GNU 'as' tool Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4838
| * | ASM: Fix preprocessor definition flags for GNU 'as' toolKyle Edwards2020-06-011-0/+1
| | | | | | | | | | | | Fixes: #20780
* | | Tests: Skip RunCMake.try_compile RerunCMake-nowork case on 1s filesystemsBrad King2020-06-012-2/+7
|/ / | | | | | | | | | | | | | | | | | | On low-resolution filesystems, `Makefile` can end up with the same time stamp as `CMakeCache.txt`. CMake must re-run in this case to be conservative, but that invalidates the `-nowork` cases. Rather than trying to detect 1s filesystems, just add an option called `CMake_TEST_FILESYSTEM_1S` that external scripts can use to tell CMake's test suite about this.
* | Merge topic 'pch-fix-bad-ClearSourcesCache'Brad King2020-06-011-2/+5
|\ \ | | | | | | | | | | | | | | | | | | | | | 902858367f Merge branch 'backport-3.16-pch-fix-bad-ClearSourcesCache' fa7b041eca PCH: Fix logic error that incorrectly clears sources during VS generation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4815
| * \ Merge branch 'backport-3.16-pch-fix-bad-ClearSourcesCache'Brad King2020-05-291-2/+5
| |\ \
| | * | PCH: Fix logic error that incorrectly clears sources during VS generationBrad King2020-05-291-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 729d997f10 (Precompile Headers: Add REUSE_FROM signature, 2019-08-30, v3.16.0-rc1~101^2), `GetPchFileObject` handles the case that it is called first for another target's `REUSE_FROM` by calling `AddSource` to make sure `GetObjectName` can produce the correct object name. However, `AddSource` causes `ClearSourcesCache` to be called, which since commit a9f4f58f0c (cmGeneratorTarget: Clear AllConfigSources in ClearSourcesCache, 2020-05-15, v3.16.7~2^2) now correctly erases the `AllConfigSources` structure. This is okay during `AddPchDependencies`, but there is another code path in which it is problematic. When the Visual Studio generator's `WriteAllSources` method is looping over the sources, the `cmake_pch.cxx` source is encountered first. This causes `OutputSourceSpecificFlags` to call `GetPchCreateCompileOptions`, which calls `GetPchFile`, which under MSVC with `CMAKE_LINK_PCH` calls `GetPchFileObject`. That leads to `ClearSourcesCache` erasing the structure over which `WriteAllSources` is iterating! This bug is caught by our `RunCMake.PrecompileHeaders` test when run with the VS generator as of the commit that exposed it by fixing `ClearSourcesCache`. However, that change was backported to the CMake 3.16 series after testing only with later versions versions that contain commit a55df20499 (Multi-Ninja: Add precompile headers support, 2020-01-10, v3.17.0-rc1~136^2). By adding proper multi-config support for PCH, that commit taught `cmLocalGenerator::AddPchDependencies` to call `GetPchFile` with the real set of configurations instead of just the empty string. This allows the `GetPchFile` cache of PCH sources to be populated up front so that the later calls to it in the `WriteAllSources` loop as described above do not actually call `GetPchFileObject` or `ClearSourcesCache`. That hid the problem. Fix this by re-ordering calls to `AddPchDependencies` to handle `REUSE_FROM` targets only after the targets whose PCH they re-use. Remove the now-unnecessary call to `AddSource` from `GetPchFileObject` so that `ClearSourcesCache` is never called during `WriteAllSources`. Update the PchReuseFrom test case to cover an ordering of targets that causes generators to encounter a `REUSE_FROM` target before the target whose PCH it re-uses. Fixes: #20770
* | | | Merge topic 'ninja-multi-export-all-symbols'Brad King2020-06-011-0/+2
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | 6fc4bfa11c Ninja Multi-Config: Fix bug in CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Alex Reinking <alex_reinking@berkeley.edu> Merge-request: !4825
| * | | Ninja Multi-Config: Fix bug in CMAKE_WINDOWS_EXPORT_ALL_SYMBOLSKyle Edwards2020-05-291-0/+2
| |/ / | | | | | | | | | Fixes: #20775
* | | ALIAS target: cannot overwrite an existing targetMarc Chevrier2020-05-286-0/+61
| | | | | | | | | | | | Fixes: #19616
* | | Merge topic 'fix-cpack-deb-generating-empty-paragraph'Brad King2020-05-281-11/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | 6ba842163c CPack-deb: don't add a line with a dot to pkg desc Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4806
| * | CPack-deb: don't add a line with a dot to pkg descJonathan Verner2020-05-271-11/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, if the package description ends with a newline (typically if it is read from a file) cpack -deb adds a single line with a dot at the end which leads to a violation of the `extended-description-contains-empty-paragraph` debian policy. This commit fixes the above behaviour. Fixes: #20763
| * | Merge topic 'ctest-repeat-notrun' into release-3.17Brad King2020-05-275-6/+49
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | bbb62dcc72 CTest: Make sure NOT_RUN tests show up in the failed test log c503251997 Tests: Add coverage of ctest_test RETURN_VALUE and REPEAT Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4801
* | \ \ Merge topic 'update-gitlab-links'Brad King2020-05-272-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | eb705b9531 Update links to gitlab.kitware.com repos to add `-/` Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !4795
| * | | | Update links to gitlab.kitware.com repos to add `-/`Brad King2020-05-262-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GitLab now uses a `/-/` component between the `group/project` part of the URL and the `{issues,merge_requests,tree}` part so that it can support `group/subgroup/project` with arbitrary depth.
* | | | | Merge topic 'test-RunCMake.install-LDFLAGS'Brad King2020-05-271-2/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1c97a3c442 Tests: Fix RunCMake.install LDFLAGS treatment Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Robert Maynard <robert.maynard@kitware.com> Merge-request: !4793
| * | | | | Tests: Fix RunCMake.install LDFLAGS treatmentBrad King2020-05-261-2/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | In commit d806bd2e8c (Tests: Update test suite to run in an Anaconda environment, 2020-03-30) an extra `}` was left in the value of the modified `LDFLAGS`. Remove it. While at it, simplify the code.
* | | | | Merge topic 'cmake_language-check-invalid-commands'Brad King2020-05-277-0/+140
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 12e483c563 cmake_language: check CALL with control command Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4788
| * | | | | cmake_language: check CALL with control commandMarc Chevrier2020-05-267-0/+140
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: #20739
* | | | | | Merge branch 'backport-ctest-repeat-notrun' into ctest-repeat-notrunBrad King2020-05-275-6/+49
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | CTest: Make sure NOT_RUN tests show up in the failed test logRobert Maynard2020-05-275-1/+28
| | | | | | | | | | | | | | | | | | | | | | | | Issue: #20543
| * | | | | Tests: Add coverage of ctest_test RETURN_VALUE and REPEATRobert Maynard2020-05-271-5/+21
| | | | | |
* | | | | | tests: avoid a warning for ctresallocBen Boeckel2020-05-261-1/+1
| |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | When testing an installed CMake, this executable does not exist. Also remove the "or build" because we are expecting it to be built if the target exists (and is a build failure if it fails there).
* | | | | Merge topic 'fetchcontent-externalproject-empty-args'Craig Scott2020-05-259-3/+72
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8dca6bd04b FetchContent: Preserve empty string arguments cbf2daeed0 ExternalProject: Preserve empty string arguments Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4729
| * | | | FetchContent: Preserve empty string argumentsCraig Scott2020-05-234-0/+26
| | | | | | | | | | | | | | | | | | | | Fixes: #20579
| * | | | ExternalProject: Preserve empty string argumentsCraig Scott2020-05-235-3/+46
| | | | |
* | | | | Merge topic 'gitlab-ci-regular-builders'Brad King2020-05-251-2/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b566f0b308 gitlab-ci: add windows builder 5b564c371e gitlab-ci: add Windows infrastructure 809f9a9916 gitlab: add powershell scripts for utilities 02c56b71a1 gitlab-ci: add a macos builder a1b1fc611b gitlab-ci: add Linux makefiles and ninja builders 3e1a1ba92d ci: add dependencies for the test suite to the Fedora image d5438f783a ci: add make to the CI image 0ed7e424ab gitlab-ci: use the cmake_build_unix anchor ... Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4723
| * | | | | Tests/RunCMake/export: handle collapsed newlinesBen Boeckel2020-05-221-2/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | When the build path is long with a space near the line length, a newline is lost.
* | | | | Merge topic 'CheckLinkerFlag-module'Brad King2020-05-259-0/+54
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | af96c0f4fa CheckLinkerFlag: Add module to check validity of linker flags 3c4cc77d55 Tests: Extend Fortran compiler information Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4777
| * | | | | CheckLinkerFlag: Add module to check validity of linker flagsMarc Chevrier2020-05-259-0/+54
| |/ / / / | | | | | | | | | | | | | | | Fixes: #15934
* | | | | 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 '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 branch 'backport-3.16-FindPkgConfig-isystem'Brad King2020-05-061-1/+21
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | FindPkgConfig: also handle "-isystem" prefixes for include directoriesRolf Eike Beer2020-05-051-1/+21
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | Fixes: #20652
* | | | | | 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-222-0/+15
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 test suite to run in an Anaconda environmentRobert Maynard2020-05-212-0/+15
| | | | | | |
* | | | | | | 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-202-2/+2
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-202-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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