mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-06 05:40:54 -06:00
Code Issues Packages Projects Releases Wiki Activity
48,874 Commits 2 Branches 385 Tags
dbd453c2ff71acae98423e0d84f2405acfa81a97
Commit Graph

7593 Commits

Author SHA1 Message Date
Brad King
947a518716 Merge topic 'file-CONFIGURE-subdir' 
e5f5eeca2f file: Fix CONFIGURE output relative path

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4951
 2020-06-30 08:04:07 -04:00
Brad King
f67a787a38 Merge topic 'find_vulkan_glslc' 
467509d767 FindVulkan: Support for finding glslc

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4944
 2020-06-30 07:27:27 -04:00
Brad King
a939f962d7 Merge topic 'find_library-file-readable' 
f2c903fb9a find_library: Check that library files are readable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4945
 2020-06-30 07:25:54 -04:00
Brad King
e5f5eeca2f file: Fix CONFIGURE output relative path 
In commit a6fee09484 (file: Add CONFIGURE subcommand, 2020-03-06,
v3.18.0-rc1~584^2) we accidentally treated relative path outputs
with respect to the current working directory.  Treat them with
respect to the current binary directory instead.

Fixes: #20885
 2020-06-29 09:20:42 -04:00
Brad King
f2b84d24cf Merge topic 'fileApiAddLanguageStandardBacktrace' 
7d6861f367 fileapi: Extend codemodel targets with language standard
ba835874a4 Add backtrace support for language standard
e43486a639 cmGeneratorTarget: Clarify name of language property lookup helper

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4798
 2020-06-29 08:25:42 -04:00
Brad King
828f85b410 Merge topic 'file-ARCHIVE_CREATE-rename-TYPE-option' 
95159b7dea file(ARCHIVE_CREATE): Rename TYPE option to COMPRESSION
bc45bdc819 Help: Fix contents indenting for file(ARCHIVE_...) subcommands

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4948
 2020-06-29 08:23:20 -04:00
Brad King
f2c903fb9a find_library: Check that library files are readable 
Refactoring in commit 6b85166920 (ENH: Refactor find_library search
logic, 2008-09-22, v2.8.0~1665) dropped a call to `FileExists` on the
path under the assumption that the presence of a file in a directory
listing means it exists.  However, dropping that also dropped a check
that verifies the file is readable.  Restore the `FileExists` call to
ensure that we only find readable libraries.
 2020-06-29 07:50:47 -04:00
Craig Scott
95159b7dea file(ARCHIVE_CREATE): Rename TYPE option to COMPRESSION 
Fixes: #20883
 2020-06-27 18:38:28 +10:00
Ryan Kawicki
467509d767 FindVulkan: Support for finding glslc 
The GLSL SPIR-V compiler is part of the Vulkan SDK and may be used
by projects for compiling shaders as part of the build process.
This is not strictly required to build a Vulkan application, which
is why the variable is not part of the REQUIRED_VARs for the module.
 2020-06-26 20:57:06 -05:00
Kyle Edwards
5fc7c14528 Merge topic 'install-default-directory-permissions' 
d4812a955b cmake-install: implement default directory permissions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4927
 2020-06-26 10:26:57 -04:00
Brad King
ab83a21933 Merge topic 'visual-studio-android' 
6051a49c78 Visual Studio: Add Android support
bbcaf9689e Refactor: Add IsAndroidGuiExecutable() method to cmTarget
14456923bd cmGlobalVisualStudio10Generator: Move variable initialization to header
d5b5c19278 cmGlobalGenerator: FindMakeProgram() before CMakeDetermineSystem

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4898
 2020-06-26 09:35:31 -04:00
Brad King
6e0143f339 Merge topic 'config_genex_support_multiple_types' 
eae15dce6a Genex: $<CONFIG:> now supports multiple configurations
c4cc21d20b cmVisualStudio10TargetGenerator: Do not segfault on empty config

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4924
 2020-06-26 09:34:27 -04:00
Brad King
ba222d9fb0 Merge topic 'GoogleTest-DISCOVERY_MODE-cleanups' 
1458b4c048 Help: Add CMAKE_GTEST_DISCOVER_TESTS_DISCOVERY_MODE to release notes
642ea49115 GoogleTest: Replace SEND_ERROR with FATAL_ERROR
09c38e8de6 Tests: Don't ask for things not required for GoogleTest

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4938
 2020-06-26 09:31:20 -04:00
Justin Goshi
7d6861f367 fileapi: Extend codemodel targets with language standard 2020-06-26 08:52:29 -04:00
Asit Dhal
d4812a955b cmake-install: implement default directory permissions 
provide an argument for default directory permissions in cmake --install

Fixes: #20700
 2020-06-25 14:43:30 -04:00
Kyle Edwards
6051a49c78 Visual Studio: Add Android support 2020-06-24 08:41:09 -04:00
Robert Maynard
eae15dce6a Genex: $<CONFIG:> now supports multiple configurations 
Instead of having to do $<OR:$<CONFIG:Release>,$<CONFIG:MinSizeRel>>
you can do $<CONFIG:Release,MinSizeRel>
 2020-06-24 08:38:28 -04:00
Craig Scott
09c38e8de6 Tests: Don't ask for things not required for GoogleTest 
The test cases only need C or C++, but not both. The CTest module
is also not needed because we are not running a dashboard script.
 2020-06-24 21:56:26 +10:00
Craig Scott
4f90fef85f Merge topic 'deprecate-pre-2.8.12' 
5845c218d7 Deprecate compatibility with CMake versions older than 2.8.12
7b07ccdd2b Tests/*Only: Update cmake_minimum_required versions
9b99b4bfc8 Tests/RunCMake: Update cmake_minimum_required versions
fcea4a3b45 cmStateSnapshot: Invert CanPopPolicyScope return value to match name

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !4897
 2020-06-23 09:36:03 -04:00
Brad King
eeff90389f Merge topic 'refactor_file_extension_queries' 
7628153edb Refactor file extension queries to be more consistent

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4925
 2020-06-23 08:14:01 -04:00
Brad King
a84c85310c Merge topic 'graphviz-cycles' 
ee5eb2eab4 Graphviz: add missing support for circular dependencies

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4926
 2020-06-23 08:12:23 -04:00
Brad King
86cd7d67d3 Merge topic 'test-all-find-modules' into release-3.18 
6c6b227813 Tests: Drop redundant FindModulesExecuteAll test

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4930
 2020-06-23 07:53:44 -04:00
Brad King
8fc9a9f4a0 Merge topic 'test-all-find-modules' 
6c6b227813 Tests: Drop redundant FindModulesExecuteAll test

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4930
 2020-06-23 07:53:44 -04:00
Brad King
6c6b227813 Tests: Drop redundant FindModulesExecuteAll test 
This test has been superseded by `CMakeOnly.AllFindModules`,
which does much more checking anyway.
 2020-06-23 07:48:53 -04:00
Robert Maynard
7628153edb Refactor file extension queries to be more consistent 
It was very easy to forgot to check against all language file
extensions. This updates the internal API to have a unified API.
 2020-06-22 09:13:16 -04:00
Corentin Plouet
ee5eb2eab4 Graphviz: add missing support for circular dependencies 
This support was actually added by removing a superfluous check that was
too eager in cmLinkItemGraphVisitor.cxx.

Extended the existing Graphviz tests to include this particular case,
and re-generated the expected output files.

Fixes: #20720
 2020-06-22 01:17:19 +10:00
Brad King
6f7853cb42 Merge topic 'get_filename_component-error-fatal' 
470b3a76b3 get_filename_component: make errors fatal

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4914
 2020-06-19 08:17:12 -04:00
Brad King
c19b5765e1 Merge topic 'FindSDL-update' 
9ffd2c70bf FindSDL: Add SDL_INCLUDE_DIRS, SDL_LIBRARIES, and SDL::SDL

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4902
 2020-06-19 08:16:40 -04:00
Brad King
d736b2ef3a Merge topic 'test-extra-generators' 
ab6e1e49c0 Tests: Simplify addition of extra generator tests
882483192d cmake: Simplify internal conditions for adding extra generators

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4909
 2020-06-19 08:15:59 -04:00
Brad King
21d0961bc2 Merge topic 'CUDAToolkit-cuda-11' into release-3.18 
b284a3c764 CudaToolkit: Update for new/removed libraries in CUDA 11

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4917
 2020-06-19 08:13:08 -04:00
Brad King
09d46e9bb6 Merge topic 'CUDAToolkit-cuda-11' 
b284a3c764 CudaToolkit: Update for new/removed libraries in CUDA 11

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4917
 2020-06-19 08:13:08 -04:00
Frédéric Simonis
9ffd2c70bf FindSDL: Add SDL_INCLUDE_DIRS, SDL_LIBRARIES, and SDL::SDL 
Also provide `SDL_VERSION[_{MAJOR,MINOR,PATCH}]`.

Fixes: #12911
 2020-06-18 16:33:17 -04:00
Asit Dhal
470b3a76b3 get_filename_component: make errors fatal 
Make all errors in `get_filename_component` fatal.

Fixes: #20015
 2020-06-18 10:01:45 -04:00
Brad King
5845c218d7 Deprecate compatibility with CMake versions older than 2.8.12 
Issue a deprecation warning on calls to `cmake_minimum_required` or
`cmake_policy` that set policies based on versions older than 2.8.12.
Note that the effective policy version includes `...<max>` treatment.
This is important in combination with commit ca24b70d31 (Export: Specify
a policy range in exported files, 2020-05-16, v3.18.0-rc1~133^2).
 2020-06-18 09:52:05 -04:00
Brad King
7b07ccdd2b Tests/*Only: Update cmake_minimum_required versions 
Use 3.3 or 2.8.12 where possible.
 2020-06-18 09:52:05 -04:00
Brad King
9b99b4bfc8 Tests/RunCMake: Update cmake_minimum_required versions 
Use 3.3 or 2.8.12 where possible.
 2020-06-18 09:52:05 -04:00
Brad King
5127d981b3 Merge topic 'test-split-RunCMake.target_link_libraries' 
5f97e44912 Tests: Shorten case names in RunCMake.target_link_libraries-* tests
0951b1fe07 Tests: Split RunCMake.target_link_libraries test

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4908
 2020-06-18 09:36:47 -04:00
Brad King
ab6e1e49c0 Tests: Simplify addition of extra generator tests 
Do not try to run the `cmake` binary that has not been built yet.
Always add the extra generator tests in combination with the
corresponding Makefile and Ninja generators.
 2020-06-18 09:29:41 -04:00
Robert Maynard
b284a3c764 CudaToolkit: Update for new/removed libraries in CUDA 11 2020-06-18 08:52:58 -04:00
Brad King
5f97e44912 Tests: Shorten case names in RunCMake.target_link_libraries-* tests 
Drop the portion of the case names that repeats the name of the
containing test.
 2020-06-17 08:13:57 -04:00
Marc Chevrier
0951b1fe07 Tests: Split RunCMake.target_link_libraries test 
Fixes: #20836
 2020-06-17 08:02:33 -04:00
Brad King
56134e3690 Merge topic 'test-file-GET_RUNTIME_DEPENDENCIES' into release-3.18 
9ae3382855 Tests: Shorten case names in RunCMake.file-GET_RUNTIME_DEPENDENCIES test
248d0570c9 Tests: Factor out RunCMake.file-GET_RUNTIME_DEPENDENCIES test

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4904
 2020-06-17 06:43:22 -04:00
Brad King
df0c97ab09 Merge topic 'test-file-GET_RUNTIME_DEPENDENCIES' 
9ae3382855 Tests: Shorten case names in RunCMake.file-GET_RUNTIME_DEPENDENCIES test
248d0570c9 Tests: Factor out RunCMake.file-GET_RUNTIME_DEPENDENCIES test

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4904
 2020-06-17 06:43:22 -04:00
Brad King
66d323bd63 Merge topic 'test-CudaOnly.StaticRuntimePlusToolkit' into release-3.18 
cb9fab49dd Tests: Fix CudaOnly.StaticRuntimePlusToolkit build rpath

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4901
 2020-06-17 06:41:56 -04:00
Brad King
652de07208 Merge topic 'test-CudaOnly.StaticRuntimePlusToolkit' 
cb9fab49dd Tests: Fix CudaOnly.StaticRuntimePlusToolkit build rpath

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4901
 2020-06-17 06:41:56 -04:00
Brad King
9ae3382855 Tests: Shorten case names in RunCMake.file-GET_RUNTIME_DEPENDENCIES test 
Now that these cases are in a dedicated test we can drop the
`file-GET_RUNTIME_DEPENDENCIES-` prefix from their name.
 2020-06-16 11:17:55 -04:00
Brad King
248d0570c9 Tests: Factor out RunCMake.file-GET_RUNTIME_DEPENDENCIES test 
Move the `file(GET_RUNTIME_DEPENDENCIES)` cases out of `RunCMake.install`.
 2020-06-16 11:17:55 -04:00
Brad King
12ce8a7ec7 Merge topic 'test-RunCMake.GeneratorExpression' 
6308bfb737 Tests: Factor out RunCMake.GenEx-GENEX_EVAL test
abe1c27499 Tests: Factor out RunCMake.GenEx-TARGET_FILE test
fbead761fe Tests: Factor out RunCMake.GenEx-DEVICE_LINK test
64a8587332 Tests: Factor out RunCMake.GenEx-HOST_LINK test
6f224a065c Tests: Factor out RunCMake.GenEx-LINK_LANG_AND_ID test
f3f6317ca3 Tests: Factor out RunCMake.GenEx-LINK_LANGUAGE test
983adb8bed Tests: Factor out RunCMake.GenEx-COMPILE_LANG_AND_ID test
931a6702f6 Tests: Factor out RunCMake.GenEx-COMPILE_LANGUAGE test

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4899
 2020-06-16 09:18:10 -04:00
Brad King
158c6511e0 Merge topic 'cmake-E-compare_files-exit-code' 
b5b6075522 cmake: add dedicated error for -E compare_files invalid arguments

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4881
 2020-06-16 09:09:32 -04:00
Brad King
f2c1debe40 Merge topic 'cpack-pre-and-post-scripts' 
915409af49 CPack: Introduce pre- and post- build actions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4846
 2020-06-16 09:08:01 -04:00