[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-2876-g20edf2d

Stephen Kelly steveire at gmail.com
Tue May 6 16:58:52 EDT 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  20edf2dee5b7d39aa99641b6c15438ff8669356f (commit)
       via  548f19537b77447ccc60c25581485ac512859ad3 (commit)
      from  f89fdd0ae1cb27fe8fa7fe505dfce6d64ff10b34 (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=20edf2dee5b7d39aa99641b6c15438ff8669356f
commit 20edf2dee5b7d39aa99641b6c15438ff8669356f
Merge: f89fdd0 548f195
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue May 6 16:58:51 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue May 6 16:58:51 2014 -0400

    Merge topic 'compile-features-C-language' into next
    
    548f1953 Fix test.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=548f19537b77447ccc60c25581485ac512859ad3
commit 548f19537b77447ccc60c25581485ac512859ad3
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue May 6 22:58:12 2014 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue May 6 22:58:12 2014 +0200

    Fix test.

diff --git a/Tests/RunCMake/CompileFeatures/CMakeLists.txt b/Tests/RunCMake/CompileFeatures/CMakeLists.txt
index de3a770..3482e6b 100644
--- a/Tests/RunCMake/CompileFeatures/CMakeLists.txt
+++ b/Tests/RunCMake/CompileFeatures/CMakeLists.txt
@@ -1,3 +1,3 @@
 cmake_minimum_required(VERSION 3.0)
-project(${RunCMake_TEST})
+project(${RunCMake_TEST} CXX)
 include(${RunCMake_TEST}.cmake)
diff --git a/Tests/RunCMake/CompileFeatures/NoSupportedCFeatures.cmake b/Tests/RunCMake/CompileFeatures/NoSupportedCFeatures.cmake
index 6b72ea9..3624d4b 100644
--- a/Tests/RunCMake/CompileFeatures/NoSupportedCFeatures.cmake
+++ b/Tests/RunCMake/CompileFeatures/NoSupportedCFeatures.cmake
@@ -1,3 +1,5 @@
 
+enable_language(C)
+
 add_library(no_features empty.c)
 target_compile_features(no_features PRIVATE c_static_assert)
diff --git a/Tests/RunCMake/CompileFeatures/NoSupportedCFeaturesGenex.cmake b/Tests/RunCMake/CompileFeatures/NoSupportedCFeaturesGenex.cmake
index abd5d09..b6053aa 100644
--- a/Tests/RunCMake/CompileFeatures/NoSupportedCFeaturesGenex.cmake
+++ b/Tests/RunCMake/CompileFeatures/NoSupportedCFeaturesGenex.cmake
@@ -1,3 +1,5 @@
 
+enable_language(C)
+
 add_library(no_features empty.c)
 target_compile_features(no_features PRIVATE $<1:c_static_assert>)
diff --git a/Tests/RunCMake/CompileFeatures/generate_feature_list.cmake b/Tests/RunCMake/CompileFeatures/generate_feature_list.cmake
index 9bfefed..09e17b1 100644
--- a/Tests/RunCMake/CompileFeatures/generate_feature_list.cmake
+++ b/Tests/RunCMake/CompileFeatures/generate_feature_list.cmake
@@ -1,4 +1,6 @@
 
+enable_language(C)
+
 file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/c_features.txt"
   "${CMAKE_C_COMPILE_FEATURES}"
 )

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

Summary of changes:
 Tests/RunCMake/CompileFeatures/CMakeLists.txt                  |    2 +-
 Tests/RunCMake/CompileFeatures/NoSupportedCFeatures.cmake      |    2 ++
 Tests/RunCMake/CompileFeatures/NoSupportedCFeaturesGenex.cmake |    2 ++
 Tests/RunCMake/CompileFeatures/generate_feature_list.cmake     |    2 ++
 4 files changed, 7 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list