Fixed compile errors with clang/GCC on Linux.

Neil MacIntosh · Anna Gringauze · commit d8974760dd6e · 2015-09-21T12:23:11.000-07:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -3,6 +3,21 @@ project(UnitTest++)
 
 option(UTPP_USE_PLUS_SIGN "Set this to OFF is you with to use '-cpp' instead of '++' in lib/include paths" ON)
 
+if(MSVC14 OR MSVC12)
+    # has the support we need
+else()
+    include(CheckCXXCompilerFlag)
+    CHECK_CXX_COMPILER_FLAG("-std=c++14" COMPILER_SUPPORTS_CXX14)
+    CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11)
+    if(COMPILER_SUPPORTS_CXX14)
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
+    elseif(COMPILER_SUPPORTS_CXX11)
+        CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+    else()
+            message(STATUS "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support. Please use a different C++ compiler.")
+    endif()
+endif()
+
 # get the main sources
 file(GLOB headers_ RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} UnitTest++/*.h)
 file(GLOB sources_ RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} UnitTest++/*.cpp)
diff --git a/tests/TestTestMacros.cpp b/tests/TestTestMacros.cpp
@@ -21,16 +21,17 @@ using namespace std;
         #define _NOEXCEPT_OP(x)
     #endif
   #endif
-  
-  /* Test for GCC >= 4.8.0 */
-  #ifdef __GNUC__
-    #if (__GNUC__ > 4) || (__GNUC__ == 4 && (__GNUC_MINOR__ > 7 ))
-      #define _NOEXCEPT_OP(x) noexcept(x)
-    #else
-        #define _NOEXCEPT_OP(x)
+
+  #ifndef __clang__
+    /* Test for GCC >= 4.8.0 */
+    #ifdef __GNUC__
+        #if (__GNUC__ > 4) || (__GNUC__ == 4 && (__GNUC_MINOR__ > 7 ))
+        #define _NOEXCEPT_OP(x) noexcept(x)
+        #else
+            #define _NOEXCEPT_OP(x)
+        #endif
     #endif
   #endif
-
 #endif
 
 namespace {
