summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2014-02-10 16:24:48 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2014-02-10 16:24:48 (GMT)
commit3c23873e04c03a9ac877a9a67325b26907e28309 (patch)
tree199f50e8d7c94f6bb93f2d04458684a60b1cf27e
parentc1166395b0c151bbb83cf3bdb56982a527e537d8 (diff)
parent78be324762f686fbd83591e3d0bba05f7844d823 (diff)
downloadCMake-3c23873e04c03a9ac877a9a67325b26907e28309.zip
CMake-3c23873e04c03a9ac877a9a67325b26907e28309.tar.gz
CMake-3c23873e04c03a9ac877a9a67325b26907e28309.tar.bz2
Merge topic 'test-CheckModules-speedup'
78be3247 Tests: Speed up RunCMake.CheckModules test
-rw-r--r--Tests/RunCMake/CheckModules/CMakeLists.txt2
-rw-r--r--Tests/RunCMake/CheckModules/CheckStructHasMemberOk.cmake2
-rw-r--r--Tests/RunCMake/CheckModules/CheckTypeSizeOk.cmake2
3 files changed, 5 insertions, 1 deletions
diff --git a/Tests/RunCMake/CheckModules/CMakeLists.txt b/Tests/RunCMake/CheckModules/CMakeLists.txt
index 65ac8e8..72abfc8 100644
--- a/Tests/RunCMake/CheckModules/CMakeLists.txt
+++ b/Tests/RunCMake/CheckModules/CMakeLists.txt
@@ -1,3 +1,3 @@
cmake_minimum_required(VERSION 2.8.11)
-project(${RunCMake_TEST})
+project(${RunCMake_TEST} NONE)
include(${RunCMake_TEST}.cmake)
diff --git a/Tests/RunCMake/CheckModules/CheckStructHasMemberOk.cmake b/Tests/RunCMake/CheckModules/CheckStructHasMemberOk.cmake
index b319e18..4c064c5 100644
--- a/Tests/RunCMake/CheckModules/CheckStructHasMemberOk.cmake
+++ b/Tests/RunCMake/CheckModules/CheckStructHasMemberOk.cmake
@@ -1,3 +1,5 @@
+enable_language(C)
+enable_language(CXX)
include(CheckStructHasMember)
check_struct_has_member("struct timeval" tv_sec sys/select.h HAVE_TIMEVAL_TV_SEC)
check_struct_has_member("struct timeval" tv_sec sys/select.h HAVE_TIMEVAL_TV_SEC_C LANGUAGE C)
diff --git a/Tests/RunCMake/CheckModules/CheckTypeSizeOk.cmake b/Tests/RunCMake/CheckModules/CheckTypeSizeOk.cmake
index 558f07e..45a4978 100644
--- a/Tests/RunCMake/CheckModules/CheckTypeSizeOk.cmake
+++ b/Tests/RunCMake/CheckModules/CheckTypeSizeOk.cmake
@@ -1,3 +1,5 @@
+enable_language(C)
+enable_language(CXX)
include(CheckTypeSize)
check_type_size(int SIZEOF_INT)
check_type_size(int SIZEOF_INT BUILTIN_TYPES_ONLY)