diff --git a/BUILD.md b/BUILD.md
index 82cbf6628c..f7dc22882a 100644
--- a/BUILD.md
+++ b/BUILD.md
@@ -2,7 +2,6 @@
 
 * [cmake](http://www.cmake.org/cmake/resources/software.html) ~> 2.8.12.2
 * [Qt](http://qt-project.org/downloads) ~> 5.3.2
-* [glm](http://glm.g-truc.net/0.9.5/index.html) ~> 0.9.5.4
 * [OpenSSL](https://www.openssl.org/related/binaries.html) ~> 1.0.1g
   * IMPORTANT: OpenSSL 1.0.1g is critical to avoid a security vulnerability.
 * [Intel Threading Building Blocks](https://www.threadingbuildingblocks.org/) ~> 4.3
@@ -10,6 +9,13 @@
 * [Bullet Physics Engine](https://code.google.com/p/bullet/downloads/list) ~> 2.82
 * [Gverb](https://github.com/highfidelity/gverb/archive/master.zip) (direct download to latest version)
 
+#### CMake External Project Dependencies
+
+The following dependencies will be downloaded, built, linked and included automatically by CMake where we require them. The CMakeLists files that handle grabbing each of the following external dependencies can be found in the [cmake/externals folder](cmake/externals). The resulting downloads, source files and binaries will be placed in the `build` directory in each of the subfolders for each external project. These are not placed in your normal build tree when doing an out of source build so that they do not need to be re-downloaded and re-compiled every time the CMake build folder is cleared.
+
+* [glm](http://glm.g-truc.net/0.9.5/index.html) ~> 0.9.5.4
+* [gverb](https://github.com/highfidelity/gverb)
+
 ### OS Specific Build Guides
 * [BUILD_OSX.md](BUILD_OSX.md) - additional instructions for OS X.
 * [BUILD_LINUX.md](BUILD_LINUX.md) - additional instructions for Linux.
diff --git a/BUILD_ANDROID.md b/BUILD_ANDROID.md
index 719aa8cfd9..6ff3160775 100644
--- a/BUILD_ANDROID.md
+++ b/BUILD_ANDROID.md
@@ -127,11 +127,6 @@ To put the Gear VR Service into developer mode you need an application with an O
 
 Once the application is on your device, go to `Settings->Application Manager->Gear VR Service->Manage Storage`. Tap on `VR Service Version` six times. It will scan your device to verify that you have an osig file in an application on your device, and then it will let you enable Developer mode.
 
-####GLM
-
-GLM is a header only library and technically the same GLM used for desktop builds of hifi could be used for the Android build. However, to avoid conflicts with system installations of Android dependencies, CMake will only look for Android headers and libraries in `ANDROID_LIB_DIR` or in your android-ndk install. 
-
-Download the [glm headers](http://sourceforge.net/projects/ogl-math/files/) from their sourceforge page. The version you download should match the requirement shown in the [general build guide](BUILD.md). Extract the archive into your `ANDROID_LIB_DIR` and rename the extracted folder to `glm`.
 
 ###CMake
 
diff --git a/BUILD_OSX.md b/BUILD_OSX.md
index fce74cf678..2d5460d39d 100644
--- a/BUILD_OSX.md
+++ b/BUILD_OSX.md
@@ -4,7 +4,7 @@ Please read the [general build guide](BUILD.md) for information on dependencies
 [Homebrew](http://brew.sh/) is an excellent package manager for OS X. It makes install of all hifi dependencies very simple.
 
     brew tap highfidelity/homebrew-formulas
-    brew install cmake glm openssl tbb libsoxr
+    brew install cmake openssl tbb libsoxr
     brew install highfidelity/formulas/qt5
     brew link qt5 --force
 
diff --git a/BUILD_WIN.md b/BUILD_WIN.md
index 8022fae5b8..6f26e8c809 100644
--- a/BUILD_WIN.md
+++ b/BUILD_WIN.md
@@ -56,9 +56,6 @@ The recommended route for CMake to find the external dependencies is to place al
             -> bin
             -> include
             -> lib
-        -> glm
-            -> glm
-                -> glm.hpp
         -> openssl
             -> bin
             -> include
@@ -129,26 +126,6 @@ Download the binary package: `glew-1.10.0-win32.zip`. Extract to %HIFI_LIB_DIR%\
 
 Add to the PATH: `%HIFI_LIB_DIR%\glew\bin\Release\Win32`
 
-###GLM
-
-This package contains only headers, so there's nothing to add to the PATH.
-
-Be careful with glm. For the folder other libraries would normally call 'include', the folder containing the headers, glm opts to use 'glm'. You will have a glm folder nested inside the top-level glm folder.
-
-###Gverb
-
-1. Go to https://github.com/highfidelity/gverb
-   Or download the sources directly via this link: 
-   https://github.com/highfidelity/gverb/archive/master.zip
-
-2. Extract the archive
-
-3. Place the directories “include” and “src” in interface/external/gverb 
-   (Normally next to this readme)
-
-4. Clear your build directory, run cmake, build and you should be all set.
-
-
 ###Bullet
 
 Bullet 2.82 source can be [downloaded here](https://code.google.com/p/bullet/downloads/detail?name=bullet-2.82-r2704.zip). Bullet does not come with prebuilt libraries, you need to make those yourself.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 04a5f3ee9a..b6eb3b935e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -104,6 +104,7 @@ set(HIFI_LIBRARY_DIR "${CMAKE_CURRENT_SOURCE_DIR}/libraries")
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/")
 
 set(MACRO_DIR "${CMAKE_CURRENT_SOURCE_DIR}/cmake/macros")
+set(EXTERNAL_PROJECT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/cmake/externals")
 
 file(GLOB HIFI_CUSTOM_MACROS "cmake/macros/*.cmake")
 foreach(CUSTOM_MACRO ${HIFI_CUSTOM_MACROS})
diff --git a/assignment-client/CMakeLists.txt b/assignment-client/CMakeLists.txt
index b56eea5c90..b16314811b 100644
--- a/assignment-client/CMakeLists.txt
+++ b/assignment-client/CMakeLists.txt
@@ -2,7 +2,9 @@ set(TARGET_NAME assignment-client)
 
 setup_hifi_project(Core Gui Network Script Widgets)
 
-include_glm()
+add_dependency_external_project(glm)
+find_package(GLM REQUIRED)
+target_include_directories(${TARGET_NAME} PRIVATE ${GLM_INCLUDE_DIRS})
 
 # link in the shared libraries
 link_hifi_libraries( 
diff --git a/cmake/externals/glm/CMakeLists.txt b/cmake/externals/glm/CMakeLists.txt
new file mode 100644
index 0000000000..b1aed7dd7f
--- /dev/null
+++ b/cmake/externals/glm/CMakeLists.txt
@@ -0,0 +1,15 @@
+set(EXTERNAL_NAME glm)
+
+include(ExternalProject)
+ExternalProject_Add(
+  ${EXTERNAL_NAME}
+  PREFIX ${EXTERNAL_NAME}
+  URL http://pkgs.fedoraproject.org/repo/pkgs/glm/glm-0.9.5.4.zip/fab76fc982b256b46208e5c750ed456a/glm-0.9.5.4.zip
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
+  LOG_DOWNLOAD ON
+)
+
+ExternalProject_Get_Property(${EXTERNAL_NAME} INSTALL_DIR)
+
+string(TOUPPER ${EXTERNAL_NAME} EXTERNAL_NAME_UPPER)
+set(${EXTERNAL_NAME_UPPER}_INCLUDE_DIRS ${INSTALL_DIR}/include CACHE TYPE STRING)
\ No newline at end of file
diff --git a/cmake/externals/gverb/CMakeLists.txt b/cmake/externals/gverb/CMakeLists.txt
new file mode 100644
index 0000000000..19a44781b1
--- /dev/null
+++ b/cmake/externals/gverb/CMakeLists.txt
@@ -0,0 +1,25 @@
+set(EXTERNAL_NAME gverb)
+
+if (ANDROID)
+  set(ANDROID_CMAKE_ARGS "-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}" "-DANDROID_NATIVE_API_LEVEL=19")
+endif ()
+
+include(ExternalProject)
+ExternalProject_Add(
+  ${EXTERNAL_NAME}
+  PREFIX ${EXTERNAL_NAME}
+  GIT_REPOSITORY https://github.com/birarda/gverb.git
+  CMAKE_ARGS ${ANDROID_CMAKE_ARGS} -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
+  LOG_DOWNLOAD ON
+)
+
+ExternalProject_Get_Property(${EXTERNAL_NAME} INSTALL_DIR)
+
+string(TOUPPER ${EXTERNAL_NAME} EXTERNAL_NAME_UPPER)
+set(${EXTERNAL_NAME_UPPER}_INCLUDE_DIRS ${INSTALL_DIR}/include CACHE TYPE STRING)
+
+if (WIN32) 
+  set(${EXTERNAL_NAME_UPPER}_LIBRARIES ${INSTALL_DIR}/lib/gverb.lib CACHE TYPE STRING)
+else ()
+  set(${EXTERNAL_NAME_UPPER}_LIBRARIES ${INSTALL_DIR}/lib/libgverb.a CACHE TYPE STRING)
+endif ()
\ No newline at end of file
diff --git a/cmake/macros/AddDependencyExternalProject.cmake b/cmake/macros/AddDependencyExternalProject.cmake
new file mode 100644
index 0000000000..ff0ced411e
--- /dev/null
+++ b/cmake/macros/AddDependencyExternalProject.cmake
@@ -0,0 +1,25 @@
+# 
+#  SetupExternalProject.cmake
+#  cmake/macros
+# 
+#  Copyright 2015 High Fidelity, Inc.
+#  Created by Stephen Birarda on February 13, 2014
+#
+#  Distributed under the Apache License, Version 2.0.
+#  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+# 
+
+macro(ADD_DEPENDENCY_EXTERNAL_PROJECT _PROJ_NAME)
+  
+  string(TOUPPER ${_PROJ_NAME} _PROJ_NAME_UPPER)
+  
+  if (NOT DEFINED GET_${_PROJ_NAME_UPPER} OR GET_${_PROJ_NAME_UPPER})
+    if (NOT TARGET ${_PROJ_NAME})    
+      add_subdirectory(${EXTERNAL_PROJECT_DIR}/${_PROJ_NAME} ${CMAKE_BINARY_DIR}/externals/${_PROJ_NAME})
+    endif ()
+  
+    add_dependencies(${TARGET_NAME} ${_PROJ_NAME})
+    
+  endif ()
+  
+endmacro()
\ No newline at end of file
diff --git a/cmake/macros/HifiLibrarySearchHints.cmake b/cmake/macros/HifiLibrarySearchHints.cmake
index e22b442beb..2eed364a68 100644
--- a/cmake/macros/HifiLibrarySearchHints.cmake
+++ b/cmake/macros/HifiLibrarySearchHints.cmake
@@ -10,22 +10,21 @@
 
 macro(HIFI_LIBRARY_SEARCH_HINTS LIBRARY_FOLDER)
   string(TOUPPER ${LIBRARY_FOLDER} LIBRARY_PREFIX)
-  set(${LIBRARY_PREFIX}_SEARCH_DIRS "")
   
   if (${LIBRARY_PREFIX}_ROOT_DIR)
-    set(${LIBRARY_PREFIX}_SEARCH_DIRS "${${LIBRARY_PREFIX}_ROOT_DIR}")
+    list(APPEND ${LIBRARY_PREFIX}_SEARCH_DIRS "${${LIBRARY_PREFIX}_ROOT_DIR}")
   endif ()
   
   if (ANDROID)
-    set(${LIBRARY_PREFIX}_SEARCH_DIRS "${${LIBRARY_PREFIX}_SEARCH_DIRS}" "/${LIBRARY_FOLDER}")
+    list(APPEND ${LIBRARY_PREFIX}_SEARCH_DIRS "/${LIBRARY_FOLDER}")
   endif ()
   
   if (DEFINED ENV{${LIBRARY_PREFIX}_ROOT_DIR})
-    set(${LIBRARY_PREFIX}_SEARCH_DIRS "${${LIBRARY_PREFIX}_SEARCH_DIRS}" "$ENV{${LIBRARY_PREFIX}_ROOT_DIR}")
+    list(APPEND ${LIBRARY_PREFIX}_SEARCH_DIRS "$ENV{${LIBRARY_PREFIX}_ROOT_DIR}")
   endif ()
   
   if (DEFINED ENV{HIFI_LIB_DIR})
-    set(${LIBRARY_PREFIX}_SEARCH_DIRS "${${LIBRARY_PREFIX}_SEARCH_DIRS}" "$ENV{HIFI_LIB_DIR}/${LIBRARY_FOLDER}")
+    list(APPEND ${LIBRARY_PREFIX}_SEARCH_DIRS "$ENV{HIFI_LIB_DIR}/${LIBRARY_FOLDER}")
   endif ()
   
 endmacro(HIFI_LIBRARY_SEARCH_HINTS _library_folder)
\ No newline at end of file
diff --git a/cmake/macros/IncludeGLM.cmake b/cmake/macros/IncludeGLM.cmake
deleted file mode 100644
index 3e4bf9174d..0000000000
--- a/cmake/macros/IncludeGLM.cmake
+++ /dev/null
@@ -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)
\ No newline at end of file
diff --git a/cmake/modules/FindGLM.cmake b/cmake/modules/FindGLM.cmake
index a75730b238..ace7360ea7 100644
--- a/cmake/modules/FindGLM.cmake
+++ b/cmake/modules/FindGLM.cmake
@@ -18,9 +18,7 @@ include("${MACRO_DIR}/HifiLibrarySearchHints.cmake")
 hifi_library_search_hints("glm")
 
 # locate header
-find_path(GLM_INCLUDE_DIR "glm/glm.hpp" HINTS ${GLM_SEARCH_DIRS})
-
-set(GLM_INCLUDE_DIRS "${GLM_INCLUDE_DIR}")
+find_path(GLM_INCLUDE_DIRS "glm/glm.hpp" HINTS ${GLM_SEARCH_DIRS})
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(GLM DEFAULT_MSG GLM_INCLUDE_DIRS)
diff --git a/cmake/modules/FindGverb.cmake b/cmake/modules/FindGverb.cmake
index d4d2377c94..e54fba8083 100644
--- a/cmake/modules/FindGverb.cmake
+++ b/cmake/modules/FindGverb.cmake
@@ -15,25 +15,11 @@
 #  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 #
 
-if (GVERB_INCLUDE_DIRS)
-  # in cache already
-  set(GVERB_FOUND TRUE)
-else (GVERB_INCLUDE_DIRS)
+include("${MACRO_DIR}/HifiLibrarySearchHints.cmake")
+hifi_library_search_hints("gverb")
 
-  include("${MACRO_DIR}/HifiLibrarySearchHints.cmake")
-  hifi_library_search_hints("gverb")
+find_path(GVERB_INCLUDE_DIRS gverb.h PATH_SUFFIXES include HINTS ${GVERB_SEARCH_DIRS})
+find_library(GVERB_LIBRARIES gverb PATH_SUFFIXES lib HINTS ${GVERB_SEARCH_DIRS})
 
-  find_path(GVERB_INCLUDE_DIRS gverb.h PATH_SUFFIXES include HINTS ${GVERB_SEARCH_DIRS} NO_CMAKE_FIND_ROOT_PATH)
-  find_path(GVERB_SRC_DIRS gverb.c PATH_SUFFIXES src HINTS ${GVERB_SEARCH_DIRS} NO_CMAKE_FIND_ROOT_PATH)
-
-  if (GVERB_INCLUDE_DIRS)
-    set(GVERB_FOUND TRUE)
-  endif (GVERB_INCLUDE_DIRS)
-
-  if (GVERB_FOUND)
-    message(STATUS "Found Gverb: ${GVERB_INCLUDE_DIRS}")
-  else (GVERB_FOUND)
-    message(FATAL_ERROR "Could NOT find Gverb. Read ./libraries/audio-client/externals/gverb/readme.txt")
-  endif (GVERB_FOUND)
-
-endif(GVERB_INCLUDE_DIRS)
\ No newline at end of file
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(GVERB DEFAULT_MSG GVERB_INCLUDE_DIRS GVERB_LIBRARIES)
\ No newline at end of file
diff --git a/gvr-interface/CMakeLists.txt b/gvr-interface/CMakeLists.txt
index 37ac6ec050..de0b66165b 100644
--- a/gvr-interface/CMakeLists.txt
+++ b/gvr-interface/CMakeLists.txt
@@ -24,7 +24,9 @@ endif ()
 
 include_directories(${Qt5Gui_PRIVATE_INCLUDE_DIRS})
 
-include_glm()
+add_dependency_external_project(glm)
+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/interface/CMakeLists.txt b/interface/CMakeLists.txt
index 8b23b85e04..7d581284e5 100644
--- a/interface/CMakeLists.txt
+++ b/interface/CMakeLists.txt
@@ -32,8 +32,6 @@ elseif (WIN32)
   set(GL_HEADERS "#include <windowshacks.h>\n#include <GL/glew.h>\n#include <GL/wglew.h>")
 endif ()
 
-# set up the external glm library
-include_glm()
 include_bullet()
 
 # create the InterfaceConfig.h file based on GL_HEADERS above
@@ -109,6 +107,11 @@ endif()
 # create the executable, make it a bundle on OS X
 add_executable(${TARGET_NAME} MACOSX_BUNDLE ${INTERFACE_SRCS} ${QM})
 
+# set up the external glm library
+add_dependency_external_project(glm)
+find_package(GLM REQUIRED)
+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 
                     audio audio-client animation script-engine physics 
diff --git a/libraries/audio-client/CMakeLists.txt b/libraries/audio-client/CMakeLists.txt
index 5477be3bc5..1cd76cf2f5 100644
--- a/libraries/audio-client/CMakeLists.txt
+++ b/libraries/audio-client/CMakeLists.txt
@@ -8,17 +8,13 @@ link_hifi_libraries(audio)
 # append audio includes to our list of includes to bubble
 list(APPEND ${TARGET_NAME}_DEPENDENCY_INCLUDES "${HIFI_LIBRARY_DIR}/audio/src")
 
-set(GVERB_ROOT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/external/gverb")
+# have CMake grab Gverb from git and then set up linking and directory include
+add_dependency_external_project(gverb)
 
-# As Gverb is currently the only reverb library, it's required.
 find_package(Gverb REQUIRED)
 
-file(GLOB GVERB_SRCS ${GVERB_SRC_DIRS}/*.c)
-add_library(gverb STATIC ${GVERB_SRCS})
-target_link_libraries(${TARGET_NAME} gverb)
-
-# append gverb includes to our list of includes to bubble
-list(APPEND ${TARGET_NAME}_DEPENDENCY_INCLUDES "${GVERB_INCLUDE_DIRS}")
+target_link_libraries(${TARGET_NAME} ${GVERB_LIBRARIES})
+target_include_directories(${TARGET_NAME} PRIVATE ${GVERB_INCLUDE_DIRS})
 
 # we use libsoxr for resampling
 find_package(Soxr REQUIRED)
diff --git a/libraries/audio-client/external/gverb/readme.txt b/libraries/audio-client/external/gverb/readme.txt
deleted file mode 100644
index bb01e48a74..0000000000
--- a/libraries/audio-client/external/gverb/readme.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-Instructions for adding the Gverb library to audio-client
-(This is a required library)
-Clément Brisset, October 22nd, 2014
-
-1. Go to https://github.com/highfidelity/gverb
-   Or download the sources directly via this link: 
-   https://github.com/highfidelity/gverb/archive/master.zip
-
-2. Extract the archive
-
-3. Place the directories “include” and “src” in libraries/audio-client/external/gverb 
-   (Normally next to this readme)
-
-4. Clear your build directory, run cmake, build and you should be all set.
diff --git a/libraries/audio-client/src/AudioClient.cpp b/libraries/audio-client/src/AudioClient.cpp
index c750978ab1..b427d5ba42 100644
--- a/libraries/audio-client/src/AudioClient.cpp
+++ b/libraries/audio-client/src/AudioClient.cpp
@@ -33,6 +33,11 @@
 #include <QtMultimedia/QAudioInput>
 #include <QtMultimedia/QAudioOutput>
 
+extern "C" {
+    #include <gverb/gverb.h>
+    #include <gverb/gverbdsp.h>
+}
+
 #include <soxr.h>
 
 #include <NodeList.h>
diff --git a/libraries/audio-client/src/AudioClient.h b/libraries/audio-client/src/AudioClient.h
index 4f16500103..0095a885eb 100644
--- a/libraries/audio-client/src/AudioClient.h
+++ b/libraries/audio-client/src/AudioClient.h
@@ -47,10 +47,7 @@
 #pragma warning( disable : 4273 )
 #pragma warning( disable : 4305 )
 #endif
-extern "C" {
-    #include <gverb.h>
-    #include <gverbdsp.h>
-}
+
 #ifdef _WIN32
 #pragma warning( pop )
 #endif
@@ -68,6 +65,7 @@ class QAudioInput;
 class QAudioOutput;
 class QIODevice;
 struct soxr;
+typedef struct ty_gverb ty_gverb;
 
 typedef glm::vec3 (*AudioPositionGetter)();
 typedef glm::quat (*AudioOrientationGetter)();
diff --git a/libraries/audio/CMakeLists.txt b/libraries/audio/CMakeLists.txt
index b08d9e88f4..6ec35e00fc 100644
--- a/libraries/audio/CMakeLists.txt
+++ b/libraries/audio/CMakeLists.txt
@@ -3,7 +3,9 @@ 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)
+find_package(GLM REQUIRED)
+target_include_directories(${TARGET_NAME} PUBLIC ${GLM_INCLUDE_DIRS})
 
 link_hifi_libraries(networking shared)
 
diff --git a/libraries/avatars/CMakeLists.txt b/libraries/avatars/CMakeLists.txt
index ccb661376d..bb4b8fdde0 100644
--- a/libraries/avatars/CMakeLists.txt
+++ b/libraries/avatars/CMakeLists.txt
@@ -3,7 +3,9 @@ set(TARGET_NAME avatars)
 # use setup_hifi_library macro to setup our project and link appropriate Qt modules
 setup_hifi_library(Network Script)
 
-include_glm()
+add_dependency_external_project(glm)
+find_package(GLM REQUIRED)
+target_include_directories(${TARGET_NAME} PUBLIC ${GLM_INCLUDE_DIRS})
 
 link_hifi_libraries(audio shared networking)
 
diff --git a/libraries/entities-renderer/CMakeLists.txt b/libraries/entities-renderer/CMakeLists.txt
index 6d7f5ee960..e706b07538 100644
--- a/libraries/entities-renderer/CMakeLists.txt
+++ b/libraries/entities-renderer/CMakeLists.txt
@@ -3,7 +3,9 @@ set(TARGET_NAME entities-renderer)
 # use setup_hifi_library macro to setup our project and link appropriate Qt modules
 setup_hifi_library(Widgets OpenGL Network Script)
 
-include_glm()
+add_dependency_external_project(glm)
+find_package(GLM REQUIRED)
+target_include_directories(${TARGET_NAME} PUBLIC ${GLM_INCLUDE_DIRS})
 
 link_hifi_libraries(shared gpu script-engine render-utils)
 
diff --git a/libraries/entities/CMakeLists.txt b/libraries/entities/CMakeLists.txt
index 7589599548..d0c39cac84 100644
--- a/libraries/entities/CMakeLists.txt
+++ b/libraries/entities/CMakeLists.txt
@@ -3,7 +3,10 @@ set(TARGET_NAME entities)
 # use setup_hifi_library macro to setup our project and link appropriate Qt modules
 setup_hifi_library(Network Script)
 
-include_glm()
+add_dependency_external_project(glm)
+find_package(GLM REQUIRED)
+target_include_directories(${TARGET_NAME} PUBLIC ${GLM_INCLUDE_DIRS})
+
 include_bullet()
 
 link_hifi_libraries(avatars shared octree gpu model fbx networking animation)
diff --git a/libraries/environment/CMakeLists.txt b/libraries/environment/CMakeLists.txt
index 962628cd85..e5e7b80701 100644
--- a/libraries/environment/CMakeLists.txt
+++ b/libraries/environment/CMakeLists.txt
@@ -3,7 +3,9 @@ set(TARGET_NAME environment)
 # use setup_hifi_library macro to setup our project and link appropriate Qt modules
 setup_hifi_library()
 
-include_glm()
+add_dependency_external_project(glm)
+find_package(GLM REQUIRED)
+target_include_directories(${TARGET_NAME} PUBLIC ${GLM_INCLUDE_DIRS})
 
 link_hifi_libraries(shared networking)
 
diff --git a/libraries/fbx/CMakeLists.txt b/libraries/fbx/CMakeLists.txt
index 67fe920568..da6d471c72 100644
--- a/libraries/fbx/CMakeLists.txt
+++ b/libraries/fbx/CMakeLists.txt
@@ -3,7 +3,9 @@ set(TARGET_NAME fbx)
 # use setup_hifi_library macro to setup our project and link appropriate Qt modules
 setup_hifi_library()
 
-include_glm()
+add_dependency_external_project(glm)
+find_package(GLM REQUIRED)
+target_include_directories(${TARGET_NAME} PUBLIC ${GLM_INCLUDE_DIRS})
 
 link_hifi_libraries(shared gpu model networking octree)
 
diff --git a/libraries/gpu/CMakeLists.txt b/libraries/gpu/CMakeLists.txt
index b6bbba1c0f..789ffdbfeb 100644
--- a/libraries/gpu/CMakeLists.txt
+++ b/libraries/gpu/CMakeLists.txt
@@ -3,8 +3,6 @@ set(TARGET_NAME gpu)
 # use setup_hifi_library macro to setup our project and link appropriate Qt modules
 setup_hifi_library()
 
-include_glm()
-
 link_hifi_libraries(shared)
 
 if (APPLE)
diff --git a/libraries/metavoxels/CMakeLists.txt b/libraries/metavoxels/CMakeLists.txt
index 4ead36e51a..593ee800a7 100644
--- a/libraries/metavoxels/CMakeLists.txt
+++ b/libraries/metavoxels/CMakeLists.txt
@@ -8,7 +8,9 @@ setup_hifi_library(Network Script Widgets)
 # link in the networking library
 link_hifi_libraries(shared networking)
 
-include_glm()
+add_dependency_external_project(glm)
+find_package(GLM REQUIRED)
+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
diff --git a/libraries/model/CMakeLists.txt b/libraries/model/CMakeLists.txt
index 309f6c3e6d..0f71a25047 100755
--- a/libraries/model/CMakeLists.txt
+++ b/libraries/model/CMakeLists.txt
@@ -3,7 +3,9 @@ set(TARGET_NAME model)
 # use setup_hifi_library macro to setup our project and link appropriate Qt modules
 setup_hifi_library()
 
-include_glm()
+add_dependency_external_project(glm)
+find_package(GLM REQUIRED)
+target_include_directories(${TARGET_NAME} PUBLIC ${GLM_INCLUDE_DIRS})
 
 link_hifi_libraries(shared gpu)
 
diff --git a/libraries/octree/CMakeLists.txt b/libraries/octree/CMakeLists.txt
index f4ac2263c2..3c7e8e7749 100644
--- a/libraries/octree/CMakeLists.txt
+++ b/libraries/octree/CMakeLists.txt
@@ -3,7 +3,9 @@ set(TARGET_NAME octree)
 # use setup_hifi_library macro to setup our project and link appropriate Qt modules
 setup_hifi_library()
 
-include_glm()
+add_dependency_external_project(glm)
+find_package(GLM REQUIRED)
+target_include_directories(${TARGET_NAME} PUBLIC ${GLM_INCLUDE_DIRS})
 
 link_hifi_libraries(shared networking)
 
diff --git a/libraries/physics/CMakeLists.txt b/libraries/physics/CMakeLists.txt
index 416ffa49f1..7fc3f82496 100644
--- a/libraries/physics/CMakeLists.txt
+++ b/libraries/physics/CMakeLists.txt
@@ -3,7 +3,10 @@ set(TARGET_NAME physics)
 # use setup_hifi_library macro to setup our project and link appropriate Qt modules
 setup_hifi_library()
 
-include_glm()
+add_dependency_external_project(glm)
+find_package(GLM REQUIRED)
+target_include_directories(${TARGET_NAME} PUBLIC ${GLM_INCLUDE_DIRS})
+
 include_bullet()
 if (BULLET_FOUND)
      target_link_libraries(${TARGET_NAME} ${BULLET_LIBRARIES})
diff --git a/libraries/render-utils/CMakeLists.txt b/libraries/render-utils/CMakeLists.txt
index ed2dcce858..054b30d7fb 100644
--- a/libraries/render-utils/CMakeLists.txt
+++ b/libraries/render-utils/CMakeLists.txt
@@ -8,7 +8,9 @@ qt5_add_resources(QT_RESOURCES_FILE "${CMAKE_CURRENT_SOURCE_DIR}/res/fonts/fonts
 # use setup_hifi_library macro to setup our project and link appropriate Qt modules
 setup_hifi_library(Widgets OpenGL Network Script)
 
-include_glm()
+add_dependency_external_project(glm)
+find_package(GLM REQUIRED)
+target_include_directories(${TARGET_NAME} PUBLIC ${GLM_INCLUDE_DIRS})
 
 link_hifi_libraries(animation fbx shared gpu)
 
diff --git a/libraries/script-engine/CMakeLists.txt b/libraries/script-engine/CMakeLists.txt
index 7ab73ceefb..4e13ddf513 100644
--- a/libraries/script-engine/CMakeLists.txt
+++ b/libraries/script-engine/CMakeLists.txt
@@ -3,7 +3,9 @@ set(TARGET_NAME script-engine)
 # use setup_hifi_library macro to setup our project and link appropriate Qt modules
 setup_hifi_library(Gui Network Script Widgets)
 
-include_glm()
+add_dependency_external_project(glm)
+find_package(GLM REQUIRED)
+target_include_directories(${TARGET_NAME} PUBLIC ${GLM_INCLUDE_DIRS})
 
 link_hifi_libraries(shared octree gpu model fbx entities animation audio physics metavoxels)
 
diff --git a/libraries/shared/CMakeLists.txt b/libraries/shared/CMakeLists.txt
index 0bbb39fdb5..54cd91deaf 100644
--- a/libraries/shared/CMakeLists.txt
+++ b/libraries/shared/CMakeLists.txt
@@ -4,5 +4,9 @@ set(TARGET_NAME shared)
 # TODO: there isn't really a good reason to have Script linked here - let's get what is requiring it out (RegisteredMetaTypes.cpp)
 setup_hifi_library(Gui Network Script Widgets)
 
+add_dependency_external_project(glm)
+find_package(GLM REQUIRED)
+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
diff --git a/tests/audio/CMakeLists.txt b/tests/audio/CMakeLists.txt
index fb6b9c2e11..62d0ce5be9 100644
--- a/tests/audio/CMakeLists.txt
+++ b/tests/audio/CMakeLists.txt
@@ -2,8 +2,6 @@ set(TARGET_NAME audio-tests)
 
 setup_hifi_project()
 
-include_glm()
-
 # link in the shared libraries
 link_hifi_libraries(shared audio networking)
 
diff --git a/tests/metavoxels/CMakeLists.txt b/tests/metavoxels/CMakeLists.txt
index 7524c5c87c..76f8870b34 100644
--- a/tests/metavoxels/CMakeLists.txt
+++ b/tests/metavoxels/CMakeLists.txt
@@ -2,8 +2,6 @@ set(TARGET_NAME metavoxel-tests)
 
 auto_mtc()
 
-include_glm()
-
 setup_hifi_project(Network Script Widgets)
 
 # link in the shared libraries
diff --git a/tests/octree/CMakeLists.txt b/tests/octree/CMakeLists.txt
index 7fc6b56332..99e3516431 100644
--- a/tests/octree/CMakeLists.txt
+++ b/tests/octree/CMakeLists.txt
@@ -2,8 +2,6 @@ set(TARGET_NAME octree-tests)
 
 setup_hifi_project(Script Network)
 
-include_glm()
-
 # link in the shared libraries
 link_hifi_libraries(shared octree gpu model fbx metavoxels networking entities avatars audio animation script-engine physics)
 
diff --git a/tests/physics/CMakeLists.txt b/tests/physics/CMakeLists.txt
index 14e6c56df3..e20f323392 100644
--- a/tests/physics/CMakeLists.txt
+++ b/tests/physics/CMakeLists.txt
@@ -2,7 +2,10 @@ set(TARGET_NAME physics-tests)
 
 setup_hifi_project()
 
-include_glm()
+add_dependency_external_project(glm)
+find_package(GLM REQUIRED)
+target_include_directories(${TARGET_NAME} PUBLIC ${GLM_INCLUDE_DIRS})
+
 include_bullet()
 
 link_hifi_libraries(shared physics)
diff --git a/tests/render-utils/CMakeLists.txt b/tests/render-utils/CMakeLists.txt
index 47d80268d8..12a9fe5701 100644
--- a/tests/render-utils/CMakeLists.txt
+++ b/tests/render-utils/CMakeLists.txt
@@ -2,8 +2,6 @@ set(TARGET_NAME render-utils-tests)
  
 setup_hifi_project(Quick Gui OpenGL)
 
-include_glm()
-
 #include_oglplus()
 
 # link in the shared libraries
diff --git a/tests/shared/CMakeLists.txt b/tests/shared/CMakeLists.txt
index f067fa52b5..0402d3c74b 100644
--- a/tests/shared/CMakeLists.txt
+++ b/tests/shared/CMakeLists.txt
@@ -2,8 +2,6 @@ set(TARGET_NAME shared-tests)
 
 setup_hifi_project()
 
-include_glm()
-
 # link in the shared libraries
 link_hifi_libraries(shared)
 
diff --git a/tools/bitstream2json/CMakeLists.txt b/tools/bitstream2json/CMakeLists.txt
index 2e8bb213be..64ffbae5bf 100644
--- a/tools/bitstream2json/CMakeLists.txt
+++ b/tools/bitstream2json/CMakeLists.txt
@@ -1,8 +1,6 @@
 set(TARGET_NAME bitstream2json)
 setup_hifi_project(Widgets Script)
 
-include_glm()
-
 link_hifi_libraries(metavoxels)
 
 include_dependency_includes()
\ No newline at end of file
diff --git a/tools/json2bitstream/CMakeLists.txt b/tools/json2bitstream/CMakeLists.txt
index 283d450e11..d69a8dbe17 100644
--- a/tools/json2bitstream/CMakeLists.txt
+++ b/tools/json2bitstream/CMakeLists.txt
@@ -1,8 +1,6 @@
 set(TARGET_NAME json2bitstream)
 setup_hifi_project(Widgets Script)
 
-include_glm()
-
 link_hifi_libraries(metavoxels)
 
 include_dependency_includes()
\ No newline at end of file