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

use external project glm in more targets

Browse source
This commit is contained in:
Stephen Birarda 2015-02-13 10:21:21 -08:00
parent 2c7e225ef7
commit df8e51f835
5 changed files with 7 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
assignment-client/CMakeLists.txt
View file

@ -2,7 +2,8 @@ set(TARGET_NAME assignment-client)
setup_hifi_project(Core Gui Network Script Widgets) setup_hifi_project(Core Gui Network Script Widgets)
include_glm() add_dependency_external_project(glm)
target_link_directories(${TARGET_NAME} PRIVATE ${GLM_INCLUDE_DIRS})
# link in the shared libraries # link in the shared libraries
link_hifi_libraries( link_hifi_libraries(

13
cmake/macros/IncludeGLM.cmake
View file

@ -1,13 +0,0 @@
#
# IncludeGLM.cmake
#
# Copyright 2013 High Fidelity, Inc.
#
# Distributed under the Apache License, Version 2.0.
# See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
#
macro(INCLUDE_GLM)
find_package(GLM REQUIRED)
include_directories(SYSTEM "${GLM_INCLUDE_DIRS}")
endmacro(INCLUDE_GLM)

3
gvr-interface/CMakeLists.txt
View file

@ -24,7 +24,8 @@ endif ()
include_directories(${Qt5Gui_PRIVATE_INCLUDE_DIRS}) include_directories(${Qt5Gui_PRIVATE_INCLUDE_DIRS})
include_glm() add_dependency_external_project(glm)
target_link_libraries(${TARGET_NAME} PRIVATE ${GLM_INCLUDE_DIRS})
link_hifi_libraries(shared networking audio-client avatars) link_hifi_libraries(shared networking audio-client avatars)
include_dependency_includes() include_dependency_includes()

2
interface/CMakeLists.txt
View file

@ -109,7 +109,7 @@ add_executable(${TARGET_NAME} MACOSX_BUNDLE ${INTERFACE_SRCS} ${QM})
# set up the external glm library # set up the external glm library
add_dependency_external_project(glm) add_dependency_external_project(glm)
target_include_directories(${TARGET_NAME} PUBLIC ${GLM_INCLUDE_DIRS}) target_include_directories(${TARGET_NAME} PRIVATE ${GLM_INCLUDE_DIRS})
# link required hifi libraries # link required hifi libraries
link_hifi_libraries(shared octree environment gpu model fbx metavoxels networking entities avatars link_hifi_libraries(shared octree environment gpu model fbx metavoxels networking entities avatars

3
libraries/audio/CMakeLists.txt
View file

@ -3,7 +3,8 @@ set(TARGET_NAME audio)
# use setup_hifi_library macro to setup our project and link appropriate Qt modules # use setup_hifi_library macro to setup our project and link appropriate Qt modules
setup_hifi_library(Network) setup_hifi_library(Network)
include_glm() add_dependency_external_project(glm)
target_include_directories(${TARGET_NAME} PUBLIC ${GLM_INCLUDE_DIRS})
link_hifi_libraries(networking shared) link_hifi_libraries(networking shared)