From 21ecaafea99c809cbdc6cdf4ea0fc765352a5943 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 22 Jan 2015 11:38:34 -0800
Subject: [PATCH] don't force system include of GLM

---
 CMakeLists.txt                | 2 --
 cmake/macros/IncludeGLM.cmake | 8 +-------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 785311d358..037f91c565 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -82,8 +82,6 @@ else ()
 endif ()
 
 set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} ${QT_CMAKE_PREFIX_PATH})
-set(QT_QMAKE_EXECUTABLE ${QT_CMAKE_PREFIX_PATH}/../../bin/qmake)
-message(STATUS "QT_QMAKE_EXECUTABLE set to ${QT_QMAKE_EXECUTABLE}")
 
 # set our OS X deployment target to
 set(CMAKE_OSX_DEPLOYMENT_TARGET 10.8)
diff --git a/cmake/macros/IncludeGLM.cmake b/cmake/macros/IncludeGLM.cmake
index e2fa981a3b..3e4bf9174d 100644
--- a/cmake/macros/IncludeGLM.cmake
+++ b/cmake/macros/IncludeGLM.cmake
@@ -8,12 +8,6 @@
 # 
 
 macro(INCLUDE_GLM)
-
 	find_package(GLM REQUIRED)
-	include_directories("${GLM_INCLUDE_DIRS}")
-
-  if (APPLE OR UNIX)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isystem ${GLM_INCLUDE_DIRS}")
-  endif ()
-
+	include_directories(SYSTEM "${GLM_INCLUDE_DIRS}")
 endmacro(INCLUDE_GLM)
\ No newline at end of file