Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-04-07 00:23:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

use MACRO_DIR variable to find glm in root externals dir

Browse source
This commit is contained in:
Stephen Birarda 2013-04-12 13:20:46 -07:00
parent 7fb52c529e
commit b0ff960e37
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cmake/macros/IncludeGLM.cmake
View file

@ -1,5 +1,5 @@
MACRO(INCLUDE_GLM TARGET)
set(GLM_ROOT_DIR ../externals)
MACRO(INCLUDE_GLM TARGET MACRO_DIR)
set(GLM_ROOT_DIR ${MACRO_DIR}/../../externals)
find_package(GLM REQUIRED)
include_directories(${GLM_INCLUDE_DIRS})
ENDMACRO(INCLUDE_GLM _target)
ENDMACRO(INCLUDE_GLM _target _macro_dir)

5
interface/CMakeLists.txt
View file

@ -7,8 +7,9 @@ set(LODEPNG_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external/LodePNG)
set(PORTAUDIO_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external/portaudio)
# set up the external glm library
include(../cmake/macros/IncludeGLM.cmake)
INCLUDE_GLM(interface)
set(MACRO_DIR ../cmake/macros)
include(${MACRO_DIR}/IncludeGLM.cmake)
include_glm(interface ${MACRO_DIR})
project(interface)

2
libraries/voxels/CMakeLists.txt
View file

@ -11,7 +11,7 @@ project(${TARGET_NAME})
# set up the external glm library
include(${MACRO_DIR}/IncludeGLM.cmake)
include_glm(${TARGET_NAME})
include_glm(${TARGET_NAME} ${MACRO_DIR})
# grab the implemenation and header files
file(GLOB HIFI_VOXELS_SRCS src/*.h src/*.cpp)