mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-06 22:30:07 -05:00
Code Issues Packages Projects Releases Wiki Activity
48,829 Commits 2 Branches 401 Tags
ba222d9fb0440c7cad845e2a01bd32fb454cc109
Commit Graph

7577 Commits

Author SHA1 Message Date
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
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
Robert Maynard cb9fab49dd Tests: Fix CudaOnly.StaticRuntimePlusToolkit build rpath 2020-06-16 08:30:42 -04:00
Brad King 6308bfb737 Tests: Factor out RunCMake.GenEx-GENEX_EVAL test 
Move the `GENEX_EVAL` cases and friends out of `RunCMake.GeneratorExpression`.
 2020-06-16 08:03:36 -04:00
Brad King abe1c27499 Tests: Factor out RunCMake.GenEx-TARGET_FILE test 
Move the `TARGET_FILE` cases and friends out of `RunCMake.GeneratorExpression`.
 2020-06-16 08:03:35 -04:00
Brad King fbead761fe Tests: Factor out RunCMake.GenEx-DEVICE_LINK test 
Move the `DEVICE_LINK` cases out of `RunCMake.GeneratorExpression`.
 2020-06-16 08:03:35 -04:00
Brad King 64a8587332 Tests: Factor out RunCMake.GenEx-HOST_LINK test 
Move the `HOST_LINK` cases out of `RunCMake.GeneratorExpression`.
 2020-06-16 08:03:35 -04:00
Brad King 6f224a065c Tests: Factor out RunCMake.GenEx-LINK_LANG_AND_ID test 
Move the `LINK_LANG_AND_ID` cases out of `RunCMake.GeneratorExpression`.
 2020-06-16 08:03:35 -04:00
Brad King f3f6317ca3 Tests: Factor out RunCMake.GenEx-LINK_LANGUAGE test 
Move the `LINK_LANGUAGE` cases out of `RunCMake.GeneratorExpression`.
 2020-06-16 08:03:35 -04:00
Brad King 983adb8bed Tests: Factor out RunCMake.GenEx-COMPILE_LANG_AND_ID test 
Move the `COMPILE_LANG_AND_ID` cases out of `RunCMake.GeneratorExpression`.
 2020-06-16 08:03:35 -04:00
Brad King 931a6702f6 Tests: Factor out RunCMake.GenEx-COMPILE_LANGUAGE test 
Move the `COMPILE_LANGUAGE` cases out of `RunCMake.GeneratorExpression`.
 2020-06-16 08:03:34 -04:00
Asit Dhal b5b6075522 cmake: add dedicated error for -E compare_files invalid arguments 
Return 2 when user provides invalid arguments

Fixes: #20815
 2020-06-15 12:39:37 -04:00
Brad King 9d45a8be08 find_program: Find programs that are executable but not readable 
This fix was first made by commit 86e6349ef7 (find_program: Find
programs that are executable but not readable, 2020-04-04,
v3.18.0-rc1~372^2) but was reverted for compatibility.  Re-introduce it
with a policy for compatibility.

Fixes: #10468
 2020-06-15 11:58:47 -04:00
Alex Turbov 915409af49 CPack: Introduce pre- and post- build actions 
CPack learned the `CPACK_PRE_BUILD_SCRIPTS`, `CPACK_POST_BUILD_SCRIPTS`,
and `CPACK_PACKAGE_FILES` variables.

The first two are lists of scripts to perform
- after pre-install files into a staging directory and before
  producing the resulting packages
- after produsing the packages

The post-build script(s) also get the list of actually produced
packages in the `CPACK_PACKAGE_FILES`.

Issue: #19077
 2020-06-15 11:06:41 -04:00
Brad King 148a5c2d42 Merge topic 'bundle-exe-space-in-name' 
d3fd518c03 find_program: Properly decode URL for bundle exe name with spaces

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4891
 2020-06-15 09:36:22 -04:00
Brad King 29e9b46ca5 Merge topic 'cmake-build-retval' 
b9dd072e05 Tests: Add case for cmake --build with a failing target
87c860ebad cmake --build: Fix exit code when building multiple targets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4878
 2020-06-15 09:26:54 -04:00
Brad King a3881d6313 Merge topic 'cuda_architectures_disable' into release-3.18 
877a92e968 CUDA: Add support for disabling CUDA_ARCHITECTURES

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4886
 2020-06-15 09:24:37 -04:00
Brad King e366317674 Merge topic 'cuda_architectures_disable' 
877a92e968 CUDA: Add support for disabling CUDA_ARCHITECTURES

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4886
 2020-06-15 09:24:37 -04:00