From b8692d8f46bbecf99fbddaec957784d00cc1b05c Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Fri, 19 Apr 2013 18:07:03 -0700 Subject: [PATCH] add glm to voxel-server build scripts --- voxel-server/CMakeLists.txt | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/voxel-server/CMakeLists.txt b/voxel-server/CMakeLists.txt index 5f9ff87fd7..99b72be9cb 100644 --- a/voxel-server/CMakeLists.txt +++ b/voxel-server/CMakeLists.txt @@ -5,6 +5,14 @@ set(TARGET_NAME voxel-server) set(ROOT_DIR ..) set(MACRO_DIR ${ROOT_DIR}/cmake/macros) +# setup for find modules +set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/../cmake/modules/") +set(GLM_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external) + +# set up the external glm library +include(${MACRO_DIR}/IncludeGLM.cmake) +include_glm(${TARGET_NAME} ${ROOT_DIR}) + include(${MACRO_DIR}/SetupHifiProject.cmake) setup_hifi_project(${TARGET_NAME}) @@ -14,4 +22,7 @@ include(${MACRO_DIR}/LinkHifiLibrary.cmake) link_hifi_library(shared ${TARGET_NAME} ${ROOT_DIR}) # link in the hifi voxels library -link_hifi_library(voxels ${TARGET_NAME} ${ROOT_DIR}) \ No newline at end of file +link_hifi_library(voxels ${TARGET_NAME} ${ROOT_DIR}) + +# find required libraries +find_package(GLM REQUIRED)