Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 22:39:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

don't force system include of GLM

Browse source
This commit is contained in:
Stephen Birarda 2015-01-22 11:38:34 -08:00
parent 3d12ed95da
commit 21ecaafea9
2 changed files with 1 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -82,8 +82,6 @@ else ()
endif () endif ()
set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} ${QT_CMAKE_PREFIX_PATH}) 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 our OS X deployment target to
set(CMAKE_OSX_DEPLOYMENT_TARGET 10.8) set(CMAKE_OSX_DEPLOYMENT_TARGET 10.8)

8
cmake/macros/IncludeGLM.cmake
View file

@ -8,12 +8,6 @@
# #
macro(INCLUDE_GLM) macro(INCLUDE_GLM)
find_package(GLM REQUIRED) find_package(GLM REQUIRED)
include_directories("${GLM_INCLUDE_DIRS}") include_directories(SYSTEM "${GLM_INCLUDE_DIRS}")
if (APPLE OR UNIX)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isystem ${GLM_INCLUDE_DIRS}")
endif ()
endmacro(INCLUDE_GLM) endmacro(INCLUDE_GLM)