From ab0692229d7952ab359cfe824a2ee49efdfb9d28 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Fri, 13 Feb 2015 14:54:21 -0800 Subject: [PATCH] fix GLM includes for gvr-interface and shared --- gvr-interface/CMakeLists.txt | 3 ++- libraries/shared/CMakeLists.txt | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/gvr-interface/CMakeLists.txt b/gvr-interface/CMakeLists.txt index 68eeb86791..de0b66165b 100644 --- a/gvr-interface/CMakeLists.txt +++ b/gvr-interface/CMakeLists.txt @@ -25,7 +25,8 @@ endif () include_directories(${Qt5Gui_PRIVATE_INCLUDE_DIRS}) add_dependency_external_project(glm) -target_link_libraries(${TARGET_NAME} PRIVATE ${GLM_INCLUDE_DIRS}) +find_package(GLM REQUIRED) +target_include_directories(${TARGET_NAME} PRIVATE ${GLM_INCLUDE_DIRS}) link_hifi_libraries(shared networking audio-client avatars) include_dependency_includes() diff --git a/libraries/shared/CMakeLists.txt b/libraries/shared/CMakeLists.txt index 5af2343ec2..54cd91deaf 100644 --- a/libraries/shared/CMakeLists.txt +++ b/libraries/shared/CMakeLists.txt @@ -6,7 +6,7 @@ setup_hifi_library(Gui Network Script Widgets) add_dependency_external_project(glm) find_package(GLM REQUIRED) -target_include_directories(${TARGET_NAME} PRIVATE ${GLM_INCLUDE_DIRS}) +target_include_directories(${TARGET_NAME} PUBLIC ${GLM_INCLUDE_DIRS}) # call macro to include our dependency includes and bubble them up via a property on our target include_dependency_includes() \ No newline at end of file