use external project glm in more targets

assignment-client/CMakeLists.txt

@@ -2,7 +2,8 @@ set(TARGET_NAME assignment-client)
 
 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_hifi_libraries( 

cmake/macros/IncludeGLM.cmake

@@ -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)

gvr-interface/CMakeLists.txt

@@ -24,7 +24,8 @@ endif ()
 
 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)
 include_dependency_includes()

interface/CMakeLists.txt

@@ -109,7 +109,7 @@ add_executable(${TARGET_NAME} MACOSX_BUNDLE ${INTERFACE_SRCS} ${QM})
 
 # set up the external glm library
 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_hifi_libraries(shared octree environment gpu model fbx metavoxels networking entities avatars 

libraries/audio/CMakeLists.txt

@@ -3,7 +3,8 @@ set(TARGET_NAME audio)
 # use setup_hifi_library macro to setup our project and link appropriate Qt modules
 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)