[Cmake-commits] CMake branch, next, updated. v3.1.0-rc2-761-g6b8513c

[Stephen Kelly]

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  6b8513cc23433ca3037560b525206aa719aa8ce0 (commit)
       via  bcbd621366047f40928e8e8245de556cdf57ab0c (commit)
      from  3a78c6d134e1abd1f456dd8802f6d9de3cf72199 (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=6b8513cc23433ca3037560b525206aa719aa8ce0
commit 6b8513cc23433ca3037560b525206aa719aa8ce0
Merge: 3a78c6d bcbd621
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Nov 20 12:24:50 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Nov 20 12:24:50 2014 -0500

    Merge topic 'default-lang-dialect' into next
    
    bcbd6213 Don't run test if flag set externally.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bcbd621366047f40928e8e8245de556cdf57ab0c
commit bcbd621366047f40928e8e8245de556cdf57ab0c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Nov 20 18:22:45 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Nov 20 18:22:45 2014 +0100

    Don't run test if flag set externally.

diff --git a/Tests/CompileFeatures/CMakeLists.txt b/Tests/CompileFeatures/CMakeLists.txt
index cf86072..ff5d745 100644
--- a/Tests/CompileFeatures/CMakeLists.txt
+++ b/Tests/CompileFeatures/CMakeLists.txt
@@ -78,21 +78,27 @@ foreach(lang CXX C)
 endforeach()
 
 if (CMAKE_C_COMPILE_FEATURES)
-  add_executable(default_dialect_C default_dialect.c)
-  target_compile_definitions(default_dialect_C PRIVATE
-    DEFAULT_C11=$<EQUAL:${CMAKE_C_STANDARD_DEFAULT},11>
-    DEFAULT_C99=$<EQUAL:${CMAKE_C_STANDARD_DEFAULT},99>
-    DEFAULT_C90=$<EQUAL:${CMAKE_C_STANDARD_DEFAULT},90>
-  )
+  string(FIND "${CMAKE_C_FLAGS}" "-std=" std_flag_idx)
+  if (std_flag_idx EQUAL -1)
+    add_executable(default_dialect_C default_dialect.c)
+    target_compile_definitions(default_dialect_C PRIVATE
+      DEFAULT_C11=$<EQUAL:${CMAKE_C_STANDARD_DEFAULT},11>
+      DEFAULT_C99=$<EQUAL:${CMAKE_C_STANDARD_DEFAULT},99>
+      DEFAULT_C90=$<EQUAL:${CMAKE_C_STANDARD_DEFAULT},90>
+    )
+  endif()
 endif()
 
 if (CMAKE_CXX_COMPILE_FEATURES)
-  add_executable(default_dialect default_dialect.cpp)
-  target_compile_definitions(default_dialect PRIVATE
-    DEFAULT_CXX14=$<EQUAL:${CMAKE_CXX_STANDARD_DEFAULT},14>
-    DEFAULT_CXX11=$<EQUAL:${CMAKE_CXX_STANDARD_DEFAULT},11>
-    DEFAULT_CXX98=$<EQUAL:${CMAKE_CXX_STANDARD_DEFAULT},98>
-  )
+  string(FIND "${CMAKE_CXX_FLAGS}" "-std=" std_flag_idx)
+  if (std_flag_idx EQUAL -1)
+    add_executable(default_dialect default_dialect.cpp)
+    target_compile_definitions(default_dialect PRIVATE
+      DEFAULT_CXX14=$<EQUAL:${CMAKE_CXX_STANDARD_DEFAULT},14>
+      DEFAULT_CXX11=$<EQUAL:${CMAKE_CXX_STANDARD_DEFAULT},11>
+      DEFAULT_CXX98=$<EQUAL:${CMAKE_CXX_STANDARD_DEFAULT},98>
+    )
+  endif()
 
   add_executable(CompileFeatures main.cpp)
   set_property(TARGET CompileFeatures

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

Summary of changes:
 Tests/CompileFeatures/CMakeLists.txt |   30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
CMake