Merge remote-tracking branch 'origin/issue157'

sungine · Mar 26, 2016 · 31c11a4 · 31c11a4
2 parents c114e97 + 982b132
commit 31c11a4
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -23,8 +23,13 @@ add_subdirectory ("console")
 
 # mongoose server is not supported in windows
 if (UNIX)
-    add_subdirectory ("unittest")
     add_subdirectory ("server")
+    # only compile unittest with gnu-c++<5.0
+    if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+        if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "5.0")
+            add_subdirectory ("unittest")
+        endif()
+    endif()
 endif()