summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* add_test: Allow special characters in test name (w/ policy CMP0110)Deniz Bahadir2020-08-12107-13/+437
| | | | | | | | | | | | | | Restore the change from commit f84af8e270 (add_test: Allow special characters in test name, 2020-05-16, v3.18.0-rc1~142^2) that had to be reverted by commit f84af8e270 (add_test: Allow special characters in test name, 2020-05-16, v3.18.0-rc1~142^2) for compatibility. Add policy CMP0110 to make the change in a compatible way. Also, support even more characters than before by generating the test scripts using bracket arguments around the test names. Fixes: #19391 Signed-off-by: Deniz Bahadir <dbahadir@benocs.com>
* Merge topic 'build-interface-targets'Brad King2020-08-1070-281/+581
|\ | | | | | | | | | | | | | | | | | | bafa9fe887 fileapi: Add INTERFACE libraries with SOURCES to codemodel-v2 4391913133 Add INTERFACE libraries to generated buildsystem if they have SOURCES afb998704e Remove filtering of allowed INTERFACE library properties e7edba2baf Makefiles: Use IsInBuildSystem in global generator target type checks Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5078
| * fileapi: Add INTERFACE libraries with SOURCES to codemodel-v2Brad King2020-08-0714-3/+263
| | | | | | | | | | | | | | | | | | | | | | | | INTERFACE libraries with SOURCES now appear in the generated buildsystem, so include them in the codemodel output too. We do not need to bump the `codemodel-v2` object kind minor version because that was already done in post-3.18 development by commit 7d6861f367 (fileapi: Extend codemodel targets with language standard, 2020-06-18). Fixes: #18608
| * Add INTERFACE libraries to generated buildsystem if they have SOURCESBrad King2020-08-0748-94/+303
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | INTERFACE libraries were created with the intention of collecting usage requirements for use by other targets via `target_link_libraries`. Therefore they were not allowed to have SOURCES and were not included in the generated buildsystem. In practice, this has become limiting: * Header-only libraries do have sources, they just do not compile. Developers should be able to edit those sources (the header files) in their IDE. * Header-only libraries may need to generate some of their header files via custom commands. Some projects work around these limitations by pairing each interface library with an `add_custom_target` that makes the header files and custom commands appear in the generated buildsystem and in IDEs. Lift such limitations by allowing INTERFACE libraries to have SOURCES. For those with sources, add a corresponding build target to the generated buildsystem. Fixes: #19145
| * Remove filtering of allowed INTERFACE library propertiesBrad King2020-08-0311-163/+6
| | | | | | | | | | | | | | | | | | | | | | Previously we disallowed use of arbitrary properties on INTERFACE libraries. The goal was to future-proof projects using them by not allowing properties to be set that may affect their future inclusion in the generated buildsystem. In order to prepare to actually include INTERFACE libraries in the generated buildsystem, drop the filter and allow arbitrary properties to be set. Issue: #19145
| * Makefiles: Use IsInBuildSystem in global generator target type checksBrad King2020-08-031-21/+9
| | | | | | | | | | | | Follow up from commit 422d9a0ab2 (Factor out generator checks for filtering out interface libraries, 2020-07-20) with more uses of `IsInBuildSystem`.
* | Merge topic 'runcmake-make-english'Brad King2020-08-101-0/+3
|\ \ | | | | | | | | | | | | | | | | | | 3d2ab71d42 Tests: Set LC_MESSAGES for RunCMake.Make Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5114
| * | Tests: Set LC_MESSAGES for RunCMake.MakeKyle Edwards2020-08-081-0/+3
| | | | | | | | | | | | | | | LANG was already set, but is not enough on some systems. Set LC_MESSAGES too.
* | | Merge topic 'clang-cl-vfs'Brad King2020-08-108-11/+56
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 20ebaed972 Clang: Add support for passing VFS arguments d993ebd4ca clang-cl: Add '--' before source file a94672b919 cmake: Change cmake_llvm_rc separator from -- to ++ to avoid conflict Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5087
| * | | Clang: Add support for passing VFS argumentsThomas Bernard2020-08-074-4/+37
| | | |
| * | | clang-cl: Add '--' before source fileThomas Bernard2020-08-072-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | On Linux and macOS, absolute paths start with `/` which may be interpreted by clang-cl as an option. To avoid this, we separate the source file path from preceding options with `--` to tell `clang-cl` it is not an option.
| * | | cmake: Change cmake_llvm_rc separator from -- to ++ to avoid conflictThomas Bernard2020-08-073-7/+11
| | | |
* | | | Merge topic 'ninja-msvc-deps-prefix'Brad King2020-08-103-3/+43
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 37a279f8d1 Ninja: Write msvc_deps_prefix as UTF-8 when console codepage is UTF-8 67599c7ada cmGeneratedFileStream: Add WriteRaw method Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5089
| * | | | Ninja: Write msvc_deps_prefix as UTF-8 when console codepage is UTF-8Ben McMorran2020-08-071-2/+20
| | | | |
| * | | | cmGeneratedFileStream: Add WriteRaw methodBen McMorran2020-08-032-1/+23
| | | | |
* | | | | Merge branch 'release-3.18'Brad King2020-08-100-0/+0
|\ \ \ \ \
| * \ \ \ \ Merge topic 'FPHSA-name-mismatches-chained-via-include' into release-3.18Brad King2020-08-107-0/+52
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 98844ec9db FPHSA: detect inclusion between find modules Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Logan Barnes <barneslt63@gmail.com> Merge-request: !5107
* | \ \ \ \ \ Merge topic 'FPHSA-name-mismatches-chained-via-include'Brad King2020-08-107-0/+52
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 98844ec9db FPHSA: detect inclusion between find modules Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Logan Barnes <barneslt63@gmail.com> Merge-request: !5107
| * | | | | | FPHSA: detect inclusion between find modulesBen Boeckel2020-08-077-0/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Various find modules include each other to delegate finding some subset or variant of the package. Ideally, these would use `find_dependency` or some other actual `find_package` mechanism, but that is a larger change. Instead, just detect inclusion and suppress FPHSA name mismatch warnings. Fixes: #21060
* | | | | | | Merge branch 'release-3.18'Brad King2020-08-100-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge topic 'xcode-try_compile-no-sign-backport' into release-3.18Brad King2020-08-101-0/+6
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 97d581b25d Xcode: Explicitly turn off signing in try_compile projects Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5117
* | \ \ \ \ \ \ Merge topic 'xcode-try_compile-no-sign-backport'Brad King2020-08-100-0/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 97d581b25d Xcode: Explicitly turn off signing in try_compile projects Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5117
| * | | | | | | Xcode: Explicitly turn off signing in try_compile projectsBrad King2020-08-101-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #18407, #20571, #20688
* | | | | | | | Merge branch 'release-3.18'Brad King2020-08-100-0/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge topic 'FindRuby-restore-include-path' into release-3.18Brad King2020-08-101-2/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6959744131 FindRuby: Restore compatibility variable RUBY_INCLUDE_PATH Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5109
* | \ \ \ \ \ \ \ Merge topic 'FindRuby-restore-include-path'Brad King2020-08-101-2/+1
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6959744131 FindRuby: Restore compatibility variable RUBY_INCLUDE_PATH Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5109
| * | | | | | | | FindRuby: Restore compatibility variable RUBY_INCLUDE_PATHBrad King2020-08-071-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit e672db628b (FindRuby: Rename variables to match case of module name, 2020-03-11, v3.18.0-rc1~546^2), the result variables named with the old `RUBY_` prefix are provided by compatibility code that maps from the new `Ruby_` prefix variables. There is no `Ruby_INCLUDE_PATH` variable, so do not try to map it to `RUBY_INCLUDE_PATH`. The latter is provided by dedicated compatibility code left from before that transition. Fixes: #21064
* | | | | | | | | Merge branch 'release-3.18'Brad King2020-08-100-0/+0
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge topic 'FindPython-user-policies' into release-3.18Brad King2020-08-102-9/+6
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a92d384548 FindPython: ensure user's policies are respected Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Henry Schreiner <henryschreineriii@gmail.com> Merge-request: !5098
* | \ \ \ \ \ \ \ \ Merge topic 'FindPython-user-policies'Brad King2020-08-102-9/+6
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a92d384548 FindPython: ensure user's policies are respected Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Henry Schreiner <henryschreineriii@gmail.com> Merge-request: !5098
| * | | | | | | | | FindPython: ensure user's policies are respectedMarc Chevrier2020-08-072-9/+6
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not set the policy version before recording our internal macros such as `__Python_add_library`. Otherwise callers get our policy version instead of theirs. Instead just set the specific policies we need. Also fix one case in our test suite where we were accidentally relying on the policy version to be set by `FindPython`. Fixes: #21042
* | | | | | | | | Merge branch 'release-3.17'Brad King2020-08-100-0/+0
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'backport-test-FindPkgConfig-isolate-env' into release-3.17Brad King2020-08-071-0/+5
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !5108
* | \ \ \ \ \ \ \ \ \ Merge branch 'release-3.16'Brad King2020-08-100-0/+0
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'backport-test-FindPkgConfig-isolate-env' into release-3.16Brad King2020-08-071-0/+5
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | Merge-request: !5108
* | | | | | | | | | | | Merge branch 'release-3.18'Brad King2020-08-100-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge topic 'test-FindPkgConfig-isolate-env' into release-3.18Brad King2020-08-101-0/+5
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8b12982653 Merge branch 'backport-test-FindPkgConfig-isolate-env' 4c939b0d39 Tests: Isolate RunCMake.FindPkgConfig from caller environment 20eeb40aaf Tests: Isolate RunCMake.FindPkgConfig from caller environment Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5108
* | | | | | | | | | | | Merge topic 'test-FindPkgConfig-isolate-env'Brad King2020-08-101-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8b12982653 Merge branch 'backport-test-FindPkgConfig-isolate-env' 4c939b0d39 Tests: Isolate RunCMake.FindPkgConfig from caller environment 20eeb40aaf Tests: Isolate RunCMake.FindPkgConfig from caller environment Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5108
| * | | | | | | | | | | Merge branch 'backport-test-FindPkgConfig-isolate-env'Brad King2020-08-070-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Tests: Isolate RunCMake.FindPkgConfig from caller environmentBrad King2020-08-071-0/+5
| | | |/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid interference from `CMAKE_PREFIX_PATH` and friends if they happen to be set in the environment from which the tests are run.
| * | | | | | | | | | Tests: Isolate RunCMake.FindPkgConfig from caller environmentBrad King2020-08-071-0/+5
| | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid interference from `CMAKE_PREFIX_PATH` and friends if they happen to be set in the environment from which the tests are run.
* | | | | | | | | | CMake Nightly Date StampKitware Robot2020-08-101-1/+1
| | | | | | | | | |
* | | | | | | | | | CMake Nightly Date StampKitware Robot2020-08-091-1/+1
| |_|_|_|_|_|_|/ / |/| | | | | | | |
* | | | | | | | | CMake Nightly Date StampKitware Robot2020-08-081-1/+1
| | | | | | | | |
* | | | | | | | | Merge topic 'cygwin-patches'Brad King2020-08-074-21/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ecc1961768 FindTclsh: Drop Cygwin-specific behavior and use POSIX code path af666acdf4 FindOpenGL: Drop Cygwin-specific behavior and use POSIX code path 8edbc59e46 install: Use case-sensitive pattern matching on Cygwin 24482499ea FindPerlLibs: Add versioned perl library name for Cygwin Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5092
| * | | | | | | | | FindTclsh: Drop Cygwin-specific behavior and use POSIX code pathLemures Lemniscati2020-08-061-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Based on downstream patch from Cygwin package for CMake by Marco Atzeri: * https://github.com/matzeri/cygwin-pkg/blob/64864eb8f0d635ea44226e4b9a41a7ca59a1c7dd/cmake/3.17.3-findtclsh.patch
| * | | | | | | | | FindOpenGL: Drop Cygwin-specific behavior and use POSIX code pathLemures Lemniscati2020-08-061-13/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Based on downstream patch from Cygwin package for CMake by Marco Atzeri: * https://github.com/matzeri/cygwin-pkg/blob/64864eb8f0d635ea44226e4b9a41a7ca59a1c7dd/cmake/3.17.3-opengl.patch
| * | | | | | | | | install: Use case-sensitive pattern matching on CygwinLemures Lemniscati2020-08-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Based on downstream patch from Cygwin package for CMake by Marco Atzeri: * https://github.com/matzeri/cygwin-pkg/blob/64864eb8f0d635ea44226e4b9a41a7ca59a1c7dd/cmake/3.17.3-case-sensitivity.patch
| * | | | | | | | | FindPerlLibs: Add versioned perl library name for CygwinLemures Lemniscati2020-08-061-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Based on downstream patch from Cygwin package for CMake by Marco Atzeri: * https://github.com/matzeri/cygwin-pkg/blob/64864eb8f0d635ea44226e4b9a41a7ca59a1c7dd/cmake/perl-libs.patch
* | | | | | | | | | Merge topic 'CUDAToolkit-no-nvcc'Brad King2020-08-072-54/+104
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7cc815a2a6 CUDAToolkit: Detect CUDA SDK that don't have nvcc Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: Raul Tambre <raul@tambre.ee> Reviewed-by: Raul Tambre <raul@tambre.ee> Merge-request: !5061