浏览代码

Merged GLM 0.9.8 branch

Christophe Riccio 9 年之前
父节点
当前提交
3f7630a7af
共有 1 个文件被更改,包括 3 次插入1 次删除
  1. 3 1
      CMakeLists.txt

+ 3 - 1
CMakeLists.txt

@@ -65,6 +65,9 @@ if(("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") OR ("${CMAKE_CXX_COMPILER_ID}"
 		set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "c++98")
 		set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++")
 		set(CMAKE_CXX_FLAGS "-std=c++98")
+		if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+			add_definitions(-Wno-long-long)
+		endif()
 	endif()
 endif()
 
@@ -89,7 +92,6 @@ else()
 		add_definitions(/Za)
 	elseif(("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") OR ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU"))
 		add_definitions(-pedantic)
-		add_definitions(-pedantic)
 	endif()
 endif()