[Cmake-commits] CMake branch, next, updated. v2.8.12.2-7473-gff39b3d

Brad King brad.king at kitware.com
Thu Feb 6 11:14:25 EST 2014


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  ff39b3d5b4230cb898e24efde73463889aae5534 (commit)
       via  78be324762f686fbd83591e3d0bba05f7844d823 (commit)
      from  a858432a59f86e69c2abebe0dfdaafef7ce7a098 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ff39b3d5b4230cb898e24efde73463889aae5534
commit ff39b3d5b4230cb898e24efde73463889aae5534
Merge: a858432 78be324
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 6 11:14:24 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Feb 6 11:14:24 2014 -0500

    Merge topic 'test-CheckModules-speedup' into next
    
    78be3247 Tests: Speed up RunCMake.CheckModules test


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=78be324762f686fbd83591e3d0bba05f7844d823
commit 78be324762f686fbd83591e3d0bba05f7844d823
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 6 11:12:50 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Feb 6 11:12:50 2014 -0500

    Tests: Speed up RunCMake.CheckModules test
    
    Enable the C and CXX languages only in the test cases that really need
    them.  In the failure cases we do not get far enough to really use the
    languages, so skip enabling them.

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)

-----------------------------------------------------------------------

Summary of changes:
 Tests/RunCMake/CheckModules/CMakeLists.txt               |    2 +-
 Tests/RunCMake/CheckModules/CheckStructHasMemberOk.cmake |    2 ++
 Tests/RunCMake/CheckModules/CheckTypeSizeOk.cmake        |    2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list