diff options
| author | Brad King <brad.king@kitware.com> | 2020-06-23 11:53:38 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-06-23 11:53:44 (GMT) |
| commit | 86cd7d67d30f255b660590f60928429db8e725cf (patch) | |
| tree | 1e42cdab2db58d3e114aace45c81fa88b7200f71 | |
| parent | c0b44e664b94953b2c9ee476ee8609eaa6c0d1c7 (diff) | |
| parent | 6c6b22781319ce84759c13353a6fd1290413c551 (diff) | |
| download | CMake-86cd7d67d30f255b660590f60928429db8e725cf.zip CMake-86cd7d67d30f255b660590f60928429db8e725cf.tar.gz CMake-86cd7d67d30f255b660590f60928429db8e725cf.tar.bz2 | |
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
| -rw-r--r-- | Tests/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | Tests/FindModulesExecuteAll/CMakeLists.txt | 30 | ||||
| -rw-r--r-- | Tests/FindModulesExecuteAll/main.c | 4 |
3 files changed, 0 insertions, 35 deletions
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index b771ff5..db6dbf3 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -349,7 +349,6 @@ if(BUILD_TESTING) # add a bunch of standard build-and-test style tests ADD_TEST_MACRO(CommandLineTest CommandLineTest) ADD_TEST_MACRO(FindPackageTest FindPackageTest) - ADD_TEST_MACRO(FindModulesExecuteAll FindModulesExecuteAll) ADD_TEST_MACRO(StringFileTest StringFileTest) ADD_TEST_MACRO(TryCompile TryCompile) ADD_TEST_MACRO(SystemInformation SystemInformation) diff --git a/Tests/FindModulesExecuteAll/CMakeLists.txt b/Tests/FindModulesExecuteAll/CMakeLists.txt deleted file mode 100644 index 4893bb3..0000000 --- a/Tests/FindModulesExecuteAll/CMakeLists.txt +++ /dev/null @@ -1,30 +0,0 @@ -# This file includes all FindXXX.cmake modules, so they are all executed. -# As it is it doesn't test a lot. -# It makes sure that the modules don't contain basic syntax errors. -# It also makes sure that modules don't fail with an error if something -# wasn't found but REQUIRED was not given. -# -# I guess more things could be added, like checking whether variables are -# defined after running the modules (e.g. FOO_FOUND etc.). -cmake_minimum_required(VERSION 2.8.4) # new enough for CMP0017 -project(FindModulesExecuteAll) - -file(GLOB all_modules "${CMAKE_CURRENT_SOURCE_DIR}/../../Modules/Find*cmake") - -foreach(module ${all_modules}) - message(STATUS "module: ${module}") - include("${module}") - - # get the "basename" of the package, so the existence of variables like - # FOO_FOUND could be tested later on, Alex - string(REGEX REPLACE ".+Find([^\\.]+)\\.cmake" "\\1" packageName "${module}") - string(TOUPPER "${packageName}" packageNameUpper) - -# disabled for now, since too many modules break: -# if(NOT DEFINED ${packageNameUpper}_FOUND) -# message(SEND_ERROR "${packageNameUpper}_FOUND not defined !") -# endif() - -endforeach() - -add_executable(FindModulesExecuteAll main.c) diff --git a/Tests/FindModulesExecuteAll/main.c b/Tests/FindModulesExecuteAll/main.c deleted file mode 100644 index f8b643a..0000000 --- a/Tests/FindModulesExecuteAll/main.c +++ /dev/null @@ -1,4 +0,0 @@ -int main() -{ - return 0; -} |