Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 08:49:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix to include GLM.

Browse source
This commit is contained in:
Andrzej Kapolka 2014-06-18 12:22:45 -07:00
parent e0689b1484
commit eea45e98d7
2 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tools/bitstream2json/CMakeLists.txt
View file

@ -9,6 +9,9 @@ set(TARGET_NAME bitstream2json)
set(ROOT_DIR ../..) set(ROOT_DIR ../..)
set(MACRO_DIR "${ROOT_DIR}/cmake/macros") 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) find_package(Qt5 COMPONENTS Network Script Widgets)
include(${MACRO_DIR}/SetupHifiProject.cmake) 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(metavoxels ${TARGET_NAME} "${ROOT_DIR}")
link_hifi_library(shared ${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) target_link_libraries(${TARGET_NAME} Qt5::Network Qt5::Widgets Qt5::Script)

6
tools/json2bitstream/CMakeLists.txt
View file

@ -9,6 +9,9 @@ set(TARGET_NAME json2bitstream)
set(ROOT_DIR ../..) set(ROOT_DIR ../..)
set(MACRO_DIR "${ROOT_DIR}/cmake/macros") 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) find_package(Qt5 COMPONENTS Network Script Widgets)
include(${MACRO_DIR}/SetupHifiProject.cmake) 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(metavoxels ${TARGET_NAME} "${ROOT_DIR}")
link_hifi_library(shared ${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) target_link_libraries(${TARGET_NAME} Qt5::Network Qt5::Widgets Qt5::Script)