Merge pull request #141 from Reification/feature-MSVC-Clang

pjohnmeyer · web-flow · commit 8c460c48e643 · 2017-06-30T23:46:28.000-05:00
Feature msvc clang
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -13,8 +13,14 @@ option(UTPP_AMPLIFY_WARNINGS
 
 set(LIB_SUFFIX "" CACHE STRING "Identifier to add to end of lib directory name e.g. 64 for lib64")
 
-if(MSVC14 OR MSVC12)
-    # has the support we need
+if(${CMAKE_CXX_COMPILER_ID} MATCHES "MSVC")
+	# CHECK_CXX_COMPILER_FLAG could be used
+	# but MSVC version is preferred for feature requirements
+	if (MSVC14 OR MSVC12)
+		# has the support we need
+	else()
+		message(STATUS "The MSVC compiler version does not support UnitTest++ C++11 features.")
+	endif()
 else()
     include(CheckCXXCompilerFlag)
     CHECK_CXX_COMPILER_FLAG("-std=c++14" COMPILER_SUPPORTS_CXX14)
@@ -24,7 +30,7 @@ else()
     elseif(COMPILER_SUPPORTS_CXX11)
         set(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.")
+        message(STATUS "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support.")
     endif()
 endif()
 
