Merged GLM 0.9.8 branch

ago%!(EXTRA string=9 years) · 3f7630a7af
parent ecc91d4361 a3b7bf46e7
commit 3f7630a7af
1 changed files with 3 additions and 1 deletions
--- a/CMakeLists.txt
+++ b/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()