From eea45e98d7895494eec70e5700f9e0713e02264d Mon Sep 17 00:00:00 2001 From: Andrzej Kapolka Date: Wed, 18 Jun 2014 12:22:45 -0700 Subject: [PATCH] Fix to include GLM. --- tools/bitstream2json/CMakeLists.txt | 6 ++++++ tools/json2bitstream/CMakeLists.txt | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/tools/bitstream2json/CMakeLists.txt b/tools/bitstream2json/CMakeLists.txt index 6483c024a7..fde80b4d33 100644 --- a/tools/bitstream2json/CMakeLists.txt +++ b/tools/bitstream2json/CMakeLists.txt @@ -9,6 +9,9 @@ set(TARGET_NAME bitstream2json) 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/") + find_package(Qt5 COMPONENTS Network Script Widgets) include(${MACRO_DIR}/SetupHifiProject.cmake) @@ -17,4 +20,7 @@ setup_hifi_project(${TARGET_NAME} TRUE) link_hifi_library(metavoxels ${TARGET_NAME} "${ROOT_DIR}") link_hifi_library(shared ${TARGET_NAME} "${ROOT_DIR}") +include(${MACRO_DIR}/IncludeGLM.cmake) +include_glm(${TARGET_NAME} "${ROOT_DIR}") + target_link_libraries(${TARGET_NAME} Qt5::Network Qt5::Widgets Qt5::Script) diff --git a/tools/json2bitstream/CMakeLists.txt b/tools/json2bitstream/CMakeLists.txt index 799f3bcc4c..51382d5858 100644 --- a/tools/json2bitstream/CMakeLists.txt +++ b/tools/json2bitstream/CMakeLists.txt @@ -9,6 +9,9 @@ set(TARGET_NAME json2bitstream) 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/") + find_package(Qt5 COMPONENTS Network Script Widgets) include(${MACRO_DIR}/SetupHifiProject.cmake) @@ -17,4 +20,7 @@ setup_hifi_project(${TARGET_NAME} TRUE) link_hifi_library(metavoxels ${TARGET_NAME} "${ROOT_DIR}") link_hifi_library(shared ${TARGET_NAME} "${ROOT_DIR}") +include(${MACRO_DIR}/IncludeGLM.cmake) +include_glm(${TARGET_NAME} "${ROOT_DIR}") + target_link_libraries(${TARGET_NAME} Qt5::Network Qt5::Widgets Qt5::Script)