From 2c7e225ef75866416026c79d28688d5420ea69ac Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 13 Feb 2015 10:14:47 -0800
Subject: [PATCH 01/34] use cmake ExternalProject for glm in Interface

---
 CMakeLists.txt                                  |  1 +
 cmake/externals/glm/CMakeLists.txt              | 11 +++++++++++
 cmake/macros/AddDependencyExternalProject.cmake | 15 +++++++++++++++
 interface/CMakeLists.txt                        |  6 ++++--
 4 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644 cmake/externals/glm/CMakeLists.txt
 create mode 100644 cmake/macros/AddDependencyExternalProject.cmake

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/cmake/externals/glm/CMakeLists.txt b/cmake/externals/glm/CMakeLists.txt
new file mode 100644
index 0000000000..0692b9573d
--- /dev/null
+++ b/cmake/externals/glm/CMakeLists.txt
@@ -0,0 +1,11 @@
+include(ExternalProject)
+ExternalProject_Add(
+  glm
+  URL https://github.com/g-truc/glm/archive/0.9.5.4.zip
+  CONFIGURE_COMMAND ""
+  BUILD_COMMAND ""
+  INSTALL_COMMAND ""
+  LOG_DOWNLOAD ON
+)
+ExternalProject_Get_Property(glm source_dir)
+set(GLM_INCLUDE_DIRS ${source_dir}/glm)
\ No newline at end of file
diff --git a/cmake/macros/AddDependencyExternalProject.cmake b/cmake/macros/AddDependencyExternalProject.cmake
new file mode 100644
index 0000000000..56cf6d71be
--- /dev/null
+++ b/cmake/macros/AddDependencyExternalProject.cmake
@@ -0,0 +1,15 @@
+# 
+#  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)
+  add_subdirectory(${EXTERNAL_PROJECT_DIR}/${_PROJ_NAME} ${EXTERNAL_PROJECT_DIR}/${_PROJ_NAME}/build)
+  add_dependencies(${TARGET_NAME} ${_PROJ_NAME})
+endmacro()
\ No newline at end of file
diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt
index 8b23b85e04..8de425d5b0 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,10 @@ 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)
+target_include_directories(${TARGET_NAME} PUBLIC ${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 

From df8e51f8353b099fe1eaf42c23bc01efc45fe0be Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 13 Feb 2015 10:21:21 -0800
Subject: [PATCH 02/34] use external project glm in more targets

---
 assignment-client/CMakeLists.txt |  3 ++-
 cmake/macros/IncludeGLM.cmake    | 13 -------------
 gvr-interface/CMakeLists.txt     |  3 ++-
 interface/CMakeLists.txt         |  2 +-
 libraries/audio/CMakeLists.txt   |  3 ++-
 5 files changed, 7 insertions(+), 17 deletions(-)
 delete mode 100644 cmake/macros/IncludeGLM.cmake

diff --git a/assignment-client/CMakeLists.txt b/assignment-client/CMakeLists.txt
index b56eea5c90..c2203316f9 100644
--- a/assignment-client/CMakeLists.txt
+++ b/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( 
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/gvr-interface/CMakeLists.txt b/gvr-interface/CMakeLists.txt
index 37ac6ec050..68eeb86791 100644
--- a/gvr-interface/CMakeLists.txt
+++ b/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()
diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt
index 8de425d5b0..2be9f7bee2 100644
--- a/interface/CMakeLists.txt
+++ b/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 
diff --git a/libraries/audio/CMakeLists.txt b/libraries/audio/CMakeLists.txt
index b08d9e88f4..c44198ddef 100644
--- a/libraries/audio/CMakeLists.txt
+++ b/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)
 

From a4752aaab07cefb31730d493348fe88fc4362d4e Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 13 Feb 2015 10:22:09 -0800
Subject: [PATCH 03/34] use external project glm in avatars

---
 libraries/avatars/CMakeLists.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libraries/avatars/CMakeLists.txt b/libraries/avatars/CMakeLists.txt
index ccb661376d..c227e057e3 100644
--- a/libraries/avatars/CMakeLists.txt
+++ b/libraries/avatars/CMakeLists.txt
@@ -3,7 +3,8 @@ 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)
+target_include_directories(${TARGET_NAME} PUBLIC ${GLM_INCLUDE_DIRS})
 
 link_hifi_libraries(audio shared networking)
 

From 866295b09e28bab615d5d11325d3f62729de1d17 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 13 Feb 2015 10:24:46 -0800
Subject: [PATCH 04/34] use external project glm in entities library

---
 libraries/entities/CMakeLists.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libraries/entities/CMakeLists.txt b/libraries/entities/CMakeLists.txt
index 7589599548..8846dbfb89 100644
--- a/libraries/entities/CMakeLists.txt
+++ b/libraries/entities/CMakeLists.txt
@@ -3,7 +3,9 @@ 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)
+target_include_directories(${TARGET_NAME} PUBLIC ${GLM_INCLUDE_DIRS})
+
 include_bullet()
 
 link_hifi_libraries(avatars shared octree gpu model fbx networking animation)

From 0e790daa5b373cf808d2c048c3867976b5600aa2 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 13 Feb 2015 10:26:23 -0800
Subject: [PATCH 05/34] remove glm dependency from entities-renderer

---
 libraries/entities-renderer/CMakeLists.txt | 2 --
 1 file changed, 2 deletions(-)

diff --git a/libraries/entities-renderer/CMakeLists.txt b/libraries/entities-renderer/CMakeLists.txt
index 6d7f5ee960..5f3b2298a8 100644
--- a/libraries/entities-renderer/CMakeLists.txt
+++ b/libraries/entities-renderer/CMakeLists.txt
@@ -3,8 +3,6 @@ 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()
-
 link_hifi_libraries(shared gpu script-engine render-utils)
 
 # call macro to include our dependency includes and bubble them up via a property on our target

From 4d5d647d846ba732c14d9720a4d8ec407fa2c6f4 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 13 Feb 2015 10:27:24 -0800
Subject: [PATCH 06/34] use external project glm in environment library

---
 libraries/environment/CMakeLists.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libraries/environment/CMakeLists.txt b/libraries/environment/CMakeLists.txt
index 962628cd85..7cd91823d3 100644
--- a/libraries/environment/CMakeLists.txt
+++ b/libraries/environment/CMakeLists.txt
@@ -3,7 +3,8 @@ 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)
+target_include_directories(${TARGET_NAME} PUBLIC ${GLM_INCLUDE_DIRS})
 
 link_hifi_libraries(shared networking)
 

From 26b93731f827417c963d79379a549791a2af4df8 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 13 Feb 2015 10:28:06 -0800
Subject: [PATCH 07/34] use glm as external project in fbx library

---
 libraries/fbx/CMakeLists.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libraries/fbx/CMakeLists.txt b/libraries/fbx/CMakeLists.txt
index 67fe920568..7e28f63fc9 100644
--- a/libraries/fbx/CMakeLists.txt
+++ b/libraries/fbx/CMakeLists.txt
@@ -3,7 +3,8 @@ 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)
+target_include_directories(${TARGET_NAME} PUBLIC ${GLM_INCLUDE_DIRS})
 
 link_hifi_libraries(shared gpu model networking octree)
 

From 54ce79db5a42e4e35aceaa0beb74de052d534c9d Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 13 Feb 2015 10:29:19 -0800
Subject: [PATCH 08/34] remove glm dependency in gpu library

---
 libraries/gpu/CMakeLists.txt | 2 --
 1 file changed, 2 deletions(-)

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)

From 16615b9be021aed93f41ac7fd2e1a593279d18eb Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 13 Feb 2015 10:30:22 -0800
Subject: [PATCH 09/34] use glm external project in metavoxels library

---
 libraries/metavoxels/CMakeLists.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libraries/metavoxels/CMakeLists.txt b/libraries/metavoxels/CMakeLists.txt
index 4ead36e51a..6143bce2dc 100644
--- a/libraries/metavoxels/CMakeLists.txt
+++ b/libraries/metavoxels/CMakeLists.txt
@@ -8,7 +8,8 @@ setup_hifi_library(Network Script Widgets)
 # link in the networking library
 link_hifi_libraries(shared networking)
 
-include_glm()
+add_dependency_external_project(glm)
+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

From 1d90c1c827111d00d71aef52be1b799a9e5fea56 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 13 Feb 2015 10:31:41 -0800
Subject: [PATCH 10/34] use glm external project in model library

---
 libraries/model/CMakeLists.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libraries/model/CMakeLists.txt b/libraries/model/CMakeLists.txt
index 309f6c3e6d..6d729ea58c 100755
--- a/libraries/model/CMakeLists.txt
+++ b/libraries/model/CMakeLists.txt
@@ -3,7 +3,8 @@ 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)
+target_include_directories(${TARGET_NAME} PUBLIC ${GLM_INCLUDE_DIRS})
 
 link_hifi_libraries(shared gpu)
 

From 8994cc026801570e44cf13cb0a71a5f81b1f364e Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 13 Feb 2015 10:32:27 -0800
Subject: [PATCH 11/34] use external project glm for octree library

---
 libraries/octree/CMakeLists.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libraries/octree/CMakeLists.txt b/libraries/octree/CMakeLists.txt
index f4ac2263c2..c55f3bae89 100644
--- a/libraries/octree/CMakeLists.txt
+++ b/libraries/octree/CMakeLists.txt
@@ -3,7 +3,8 @@ 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)
+target_include_directories(${TARGET_NAME} PUBLIC ${GLM_INCLUDE_DIRS})
 
 link_hifi_libraries(shared networking)
 

From d7ce10dedb0b4b493ae456066201a936adeb57d1 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 13 Feb 2015 10:33:35 -0800
Subject: [PATCH 12/34] use external project glm for physics library

---
 libraries/physics/CMakeLists.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libraries/physics/CMakeLists.txt b/libraries/physics/CMakeLists.txt
index 416ffa49f1..8b48501458 100644
--- a/libraries/physics/CMakeLists.txt
+++ b/libraries/physics/CMakeLists.txt
@@ -3,7 +3,9 @@ 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)
+target_include_directories(${TARGET_NAME} PUBLIC ${GLM_INCLUDE_DIRS})
+
 include_bullet()
 if (BULLET_FOUND)
      target_link_libraries(${TARGET_NAME} ${BULLET_LIBRARIES})

From fa6f6a6b71d0cf7e3ed88cfb32ad1175e791ca7a Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 13 Feb 2015 10:34:19 -0800
Subject: [PATCH 13/34] use external project glm in render-utils

---
 libraries/render-utils/CMakeLists.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libraries/render-utils/CMakeLists.txt b/libraries/render-utils/CMakeLists.txt
index ed2dcce858..0bf7e91951 100644
--- a/libraries/render-utils/CMakeLists.txt
+++ b/libraries/render-utils/CMakeLists.txt
@@ -8,7 +8,8 @@ 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)
+target_include_directories(${TARGET_NAME} PUBLIC ${GLM_INCLUDE_DIRS})
 
 link_hifi_libraries(animation fbx shared gpu)
 

From b7135510873ab205ea8d1e5447970a4cb8a35c8a Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 13 Feb 2015 10:35:06 -0800
Subject: [PATCH 14/34] use external project glm in script-engine

---
 libraries/script-engine/CMakeLists.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libraries/script-engine/CMakeLists.txt b/libraries/script-engine/CMakeLists.txt
index 7ab73ceefb..2c325e4daf 100644
--- a/libraries/script-engine/CMakeLists.txt
+++ b/libraries/script-engine/CMakeLists.txt
@@ -3,7 +3,8 @@ 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)
+target_include_directories(${TARGET_NAME} PUBLIC ${GLM_INCLUDE_DIRS})
 
 link_hifi_libraries(shared octree gpu model fbx entities animation audio physics metavoxels)
 

From d3973a724c3fe3e9b013c5d638ea85e8b8b4435d Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 13 Feb 2015 10:35:52 -0800
Subject: [PATCH 15/34] remove glm requirement in audio tests

---
 tests/audio/CMakeLists.txt | 2 --
 1 file changed, 2 deletions(-)

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)
 

From 0e32ed280a059d621ad73eae52634b2f926523f5 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 13 Feb 2015 10:36:23 -0800
Subject: [PATCH 16/34] put back glm dependency via external proj in
 entities-renderer

---
 libraries/entities-renderer/CMakeLists.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/libraries/entities-renderer/CMakeLists.txt b/libraries/entities-renderer/CMakeLists.txt
index 5f3b2298a8..46d6b8a462 100644
--- a/libraries/entities-renderer/CMakeLists.txt
+++ b/libraries/entities-renderer/CMakeLists.txt
@@ -3,6 +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)
 
+add_dependency_external_project(glm)
+target_include_directories(${TARGET_NAME} PUBLIC ${GLM_INCLUDE_DIRS})
+
 link_hifi_libraries(shared gpu script-engine render-utils)
 
 # call macro to include our dependency includes and bubble them up via a property on our target

From 263afdd22c22f7acb33f8fbeff8cc22745ce8232 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 13 Feb 2015 10:37:17 -0800
Subject: [PATCH 17/34] use external project glm in physics tests

---
 tests/physics/CMakeLists.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/physics/CMakeLists.txt b/tests/physics/CMakeLists.txt
index 14e6c56df3..89fba47bea 100644
--- a/tests/physics/CMakeLists.txt
+++ b/tests/physics/CMakeLists.txt
@@ -2,7 +2,9 @@ set(TARGET_NAME physics-tests)
 
 setup_hifi_project()
 
-include_glm()
+add_dependency_external_project(glm)
+target_include_directories(${TARGET_NAME} PUBLIC ${GLM_INCLUDE_DIRS})
+
 include_bullet()
 
 link_hifi_libraries(shared physics)

From 9c13bec47686a019d0188c4c442716ed490c1603 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 13 Feb 2015 10:38:01 -0800
Subject: [PATCH 18/34] remove glm include where no longer required

---
 tests/metavoxels/CMakeLists.txt     | 2 --
 tests/octree/CMakeLists.txt         | 2 --
 tests/render-utils/CMakeLists.txt   | 2 --
 tests/shared/CMakeLists.txt         | 2 --
 tools/bitstream2json/CMakeLists.txt | 2 --
 tools/json2bitstream/CMakeLists.txt | 2 --
 6 files changed, 12 deletions(-)

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/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

From 2f875cc08e741a69555deab94d861f9280953c21 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 13 Feb 2015 10:38:13 -0800
Subject: [PATCH 19/34] remove the glm find module

---
 cmake/modules/FindGLM.cmake | 28 ----------------------------
 1 file changed, 28 deletions(-)
 delete mode 100644 cmake/modules/FindGLM.cmake

diff --git a/cmake/modules/FindGLM.cmake b/cmake/modules/FindGLM.cmake
deleted file mode 100644
index a75730b238..0000000000
--- a/cmake/modules/FindGLM.cmake
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-#  FindGLM.cmake
-# 
-#  Try to find GLM include path.
-#  Once done this will define
-#
-#  GLM_INCLUDE_DIRS
-# 
-#  Created on 7/17/2014 by Stephen Birarda
-#  Copyright 2014 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
-# 
-
-# setup hints for GLM search
-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}")
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(GLM DEFAULT_MSG GLM_INCLUDE_DIRS)
-
-mark_as_advanced(GLM_INCLUDE_DIRS GLM_SEARCH_DIRS)
\ No newline at end of file

From 9136154cd5adc3a566c10ee62b9ab20f21442f18 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 13 Feb 2015 10:48:27 -0800
Subject: [PATCH 20/34] fix double subdir include, clear up build guide

---
 BUILD.md                                        | 7 ++++++-
 assignment-client/CMakeLists.txt                | 2 +-
 cmake/macros/AddDependencyExternalProject.cmake | 5 ++++-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/BUILD.md b/BUILD.md
index 82cbf6628c..3065254529 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,12 @@
 * [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
+
 ### 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/assignment-client/CMakeLists.txt b/assignment-client/CMakeLists.txt
index c2203316f9..d8d2d44090 100644
--- a/assignment-client/CMakeLists.txt
+++ b/assignment-client/CMakeLists.txt
@@ -3,7 +3,7 @@ set(TARGET_NAME assignment-client)
 setup_hifi_project(Core Gui Network Script Widgets)
 
 add_dependency_external_project(glm)
-target_link_directories(${TARGET_NAME} PRIVATE ${GLM_INCLUDE_DIRS})
+target_include_directories(${TARGET_NAME} PRIVATE ${GLM_INCLUDE_DIRS})
 
 # link in the shared libraries
 link_hifi_libraries( 
diff --git a/cmake/macros/AddDependencyExternalProject.cmake b/cmake/macros/AddDependencyExternalProject.cmake
index 56cf6d71be..96b3ee44ab 100644
--- a/cmake/macros/AddDependencyExternalProject.cmake
+++ b/cmake/macros/AddDependencyExternalProject.cmake
@@ -10,6 +10,9 @@
 # 
 
 macro(ADD_DEPENDENCY_EXTERNAL_PROJECT _PROJ_NAME)
-  add_subdirectory(${EXTERNAL_PROJECT_DIR}/${_PROJ_NAME} ${EXTERNAL_PROJECT_DIR}/${_PROJ_NAME}/build)
+  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})
 endmacro()
\ No newline at end of file

From 50c9bb2ae53fedf222a938c0536e6d105b6a5614 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 13 Feb 2015 12:33:27 -0800
Subject: [PATCH 21/34] remove glm as manual dep in BUILD guides

---
 BUILD_ANDROID.md                                |  5 -----
 BUILD_OSX.md                                    |  2 +-
 BUILD_WIN.md                                    |  9 ---------
 cmake/externals/glm/CMakeLists.txt              |  9 ++++-----
 cmake/macros/AddDependencyExternalProject.cmake | 12 +++++++++++-
 5 files changed, 16 insertions(+), 21 deletions(-)

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..ebc0b60f25 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,12 +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
diff --git a/cmake/externals/glm/CMakeLists.txt b/cmake/externals/glm/CMakeLists.txt
index 0692b9573d..6246993df5 100644
--- a/cmake/externals/glm/CMakeLists.txt
+++ b/cmake/externals/glm/CMakeLists.txt
@@ -2,10 +2,9 @@ include(ExternalProject)
 ExternalProject_Add(
   glm
   URL https://github.com/g-truc/glm/archive/0.9.5.4.zip
-  CONFIGURE_COMMAND ""
-  BUILD_COMMAND ""
-  INSTALL_COMMAND ""
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
   LOG_DOWNLOAD ON
 )
-ExternalProject_Get_Property(glm source_dir)
-set(GLM_INCLUDE_DIRS ${source_dir}/glm)
\ No newline at end of file
+ExternalProject_Get_Property(glm install_dir)
+
+export(TARGETS glm FILE ${CMAKE_BINARY_DIR}/glm-config.cmake)
\ No newline at end of file
diff --git a/cmake/macros/AddDependencyExternalProject.cmake b/cmake/macros/AddDependencyExternalProject.cmake
index 96b3ee44ab..c4c2c0d005 100644
--- a/cmake/macros/AddDependencyExternalProject.cmake
+++ b/cmake/macros/AddDependencyExternalProject.cmake
@@ -11,8 +11,18 @@
 
 macro(ADD_DEPENDENCY_EXTERNAL_PROJECT _PROJ_NAME)
   if (NOT TARGET ${_PROJ_NAME})
-    add_subdirectory(${EXTERNAL_PROJECT_DIR}/${_PROJ_NAME} ${CMAKE_BINARY_DIR}/externals/${_PROJ_NAME})
+    
+    if (ANDROID)
+      set(_PROJ_BINARY_DIR ${EXTERNAL_PROJECT_DIR}/${_PROJ_NAME}/build/android)
+    else ()
+      set(_PROJ_BINARY_DIR ${EXTERNAL_PROJECT_DIR}/${_PROJ_NAME}/build)
+    endif ()
+    
+    add_subdirectory(${EXTERNAL_PROJECT_DIR}/${_PROJ_NAME} ${_PROJ_BINARY_DIR})
   endif ()
   
+  string(TOUPPER ${_PROJ_NAME} _PROJ_NAME_UPPER)
+  get_target_property(${_PROJ_NAME_UPPER}_INCLUDE_DIRS ${_PROJ_NAME} INCLUDE_DIRS)
+  
   add_dependencies(${TARGET_NAME} ${_PROJ_NAME})
 endmacro()
\ No newline at end of file

From 8c998a65eee153ed4ed38765579a1df295ed3ed9 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 13 Feb 2015 12:50:32 -0800
Subject: [PATCH 22/34] use the glm find_package and check externals

---
 assignment-client/CMakeLists.txt           |  1 +
 cmake/externals/glm/CMakeLists.txt         |  1 +
 cmake/macros/HifiLibrarySearchHints.cmake  | 11 +++++----
 cmake/modules/FindGLM.cmake                | 28 ++++++++++++++++++++++
 interface/CMakeLists.txt                   |  1 +
 libraries/audio/CMakeLists.txt             |  1 +
 libraries/avatars/CMakeLists.txt           |  1 +
 libraries/entities-renderer/CMakeLists.txt |  1 +
 libraries/entities/CMakeLists.txt          |  1 +
 libraries/environment/CMakeLists.txt       |  1 +
 libraries/fbx/CMakeLists.txt               |  1 +
 libraries/metavoxels/CMakeLists.txt        |  1 +
 libraries/model/CMakeLists.txt             |  1 +
 libraries/octree/CMakeLists.txt            |  1 +
 libraries/physics/CMakeLists.txt           |  1 +
 libraries/render-utils/CMakeLists.txt      |  1 +
 libraries/script-engine/CMakeLists.txt     |  1 +
 tests/physics/CMakeLists.txt               |  1 +
 18 files changed, 50 insertions(+), 5 deletions(-)
 create mode 100644 cmake/modules/FindGLM.cmake

diff --git a/assignment-client/CMakeLists.txt b/assignment-client/CMakeLists.txt
index d8d2d44090..b16314811b 100644
--- a/assignment-client/CMakeLists.txt
+++ b/assignment-client/CMakeLists.txt
@@ -3,6 +3,7 @@ set(TARGET_NAME assignment-client)
 setup_hifi_project(Core Gui Network Script Widgets)
 
 add_dependency_external_project(glm)
+find_package(GLM REQUIRED)
 target_include_directories(${TARGET_NAME} PRIVATE ${GLM_INCLUDE_DIRS})
 
 # link in the shared libraries
diff --git a/cmake/externals/glm/CMakeLists.txt b/cmake/externals/glm/CMakeLists.txt
index 6246993df5..a3b64b9370 100644
--- a/cmake/externals/glm/CMakeLists.txt
+++ b/cmake/externals/glm/CMakeLists.txt
@@ -1,6 +1,7 @@
 include(ExternalProject)
 ExternalProject_Add(
   glm
+  PREFIX glm
   URL https://github.com/g-truc/glm/archive/0.9.5.4.zip
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
   LOG_DOWNLOAD ON
diff --git a/cmake/macros/HifiLibrarySearchHints.cmake b/cmake/macros/HifiLibrarySearchHints.cmake
index e22b442beb..e4b67af15e 100644
--- a/cmake/macros/HifiLibrarySearchHints.cmake
+++ b/cmake/macros/HifiLibrarySearchHints.cmake
@@ -10,22 +10,23 @@
 
 macro(HIFI_LIBRARY_SEARCH_HINTS LIBRARY_FOLDER)
   string(TOUPPER ${LIBRARY_FOLDER} LIBRARY_PREFIX)
-  set(${LIBRARY_PREFIX}_SEARCH_DIRS "")
+  
+  set(${LIBRARY_PREFIX}_SEARCH_DIRS "${EXTERNAL_PROJECT_DIR}/${LIBRARY_FOLDER}/build/${LIBRARY_FOLDER}")
   
   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/modules/FindGLM.cmake b/cmake/modules/FindGLM.cmake
new file mode 100644
index 0000000000..a75730b238
--- /dev/null
+++ b/cmake/modules/FindGLM.cmake
@@ -0,0 +1,28 @@
+#
+#  FindGLM.cmake
+# 
+#  Try to find GLM include path.
+#  Once done this will define
+#
+#  GLM_INCLUDE_DIRS
+# 
+#  Created on 7/17/2014 by Stephen Birarda
+#  Copyright 2014 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
+# 
+
+# setup hints for GLM search
+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}")
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(GLM DEFAULT_MSG GLM_INCLUDE_DIRS)
+
+mark_as_advanced(GLM_INCLUDE_DIRS GLM_SEARCH_DIRS)
\ No newline at end of file
diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt
index 2be9f7bee2..7d581284e5 100644
--- a/interface/CMakeLists.txt
+++ b/interface/CMakeLists.txt
@@ -109,6 +109,7 @@ 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
diff --git a/libraries/audio/CMakeLists.txt b/libraries/audio/CMakeLists.txt
index c44198ddef..6ec35e00fc 100644
--- a/libraries/audio/CMakeLists.txt
+++ b/libraries/audio/CMakeLists.txt
@@ -4,6 +4,7 @@ set(TARGET_NAME audio)
 setup_hifi_library(Network)
 
 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 c227e057e3..bb4b8fdde0 100644
--- a/libraries/avatars/CMakeLists.txt
+++ b/libraries/avatars/CMakeLists.txt
@@ -4,6 +4,7 @@ set(TARGET_NAME avatars)
 setup_hifi_library(Network Script)
 
 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 46d6b8a462..e706b07538 100644
--- a/libraries/entities-renderer/CMakeLists.txt
+++ b/libraries/entities-renderer/CMakeLists.txt
@@ -4,6 +4,7 @@ set(TARGET_NAME entities-renderer)
 setup_hifi_library(Widgets OpenGL Network Script)
 
 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 8846dbfb89..d0c39cac84 100644
--- a/libraries/entities/CMakeLists.txt
+++ b/libraries/entities/CMakeLists.txt
@@ -4,6 +4,7 @@ set(TARGET_NAME entities)
 setup_hifi_library(Network Script)
 
 add_dependency_external_project(glm)
+find_package(GLM REQUIRED)
 target_include_directories(${TARGET_NAME} PUBLIC ${GLM_INCLUDE_DIRS})
 
 include_bullet()
diff --git a/libraries/environment/CMakeLists.txt b/libraries/environment/CMakeLists.txt
index 7cd91823d3..e5e7b80701 100644
--- a/libraries/environment/CMakeLists.txt
+++ b/libraries/environment/CMakeLists.txt
@@ -4,6 +4,7 @@ set(TARGET_NAME environment)
 setup_hifi_library()
 
 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 7e28f63fc9..da6d471c72 100644
--- a/libraries/fbx/CMakeLists.txt
+++ b/libraries/fbx/CMakeLists.txt
@@ -4,6 +4,7 @@ set(TARGET_NAME fbx)
 setup_hifi_library()
 
 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/metavoxels/CMakeLists.txt b/libraries/metavoxels/CMakeLists.txt
index 6143bce2dc..593ee800a7 100644
--- a/libraries/metavoxels/CMakeLists.txt
+++ b/libraries/metavoxels/CMakeLists.txt
@@ -9,6 +9,7 @@ setup_hifi_library(Network Script Widgets)
 link_hifi_libraries(shared networking)
 
 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
diff --git a/libraries/model/CMakeLists.txt b/libraries/model/CMakeLists.txt
index 6d729ea58c..0f71a25047 100755
--- a/libraries/model/CMakeLists.txt
+++ b/libraries/model/CMakeLists.txt
@@ -4,6 +4,7 @@ set(TARGET_NAME model)
 setup_hifi_library()
 
 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 c55f3bae89..3c7e8e7749 100644
--- a/libraries/octree/CMakeLists.txt
+++ b/libraries/octree/CMakeLists.txt
@@ -4,6 +4,7 @@ set(TARGET_NAME octree)
 setup_hifi_library()
 
 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 8b48501458..7fc3f82496 100644
--- a/libraries/physics/CMakeLists.txt
+++ b/libraries/physics/CMakeLists.txt
@@ -4,6 +4,7 @@ set(TARGET_NAME physics)
 setup_hifi_library()
 
 add_dependency_external_project(glm)
+find_package(GLM REQUIRED)
 target_include_directories(${TARGET_NAME} PUBLIC ${GLM_INCLUDE_DIRS})
 
 include_bullet()
diff --git a/libraries/render-utils/CMakeLists.txt b/libraries/render-utils/CMakeLists.txt
index 0bf7e91951..054b30d7fb 100644
--- a/libraries/render-utils/CMakeLists.txt
+++ b/libraries/render-utils/CMakeLists.txt
@@ -9,6 +9,7 @@ qt5_add_resources(QT_RESOURCES_FILE "${CMAKE_CURRENT_SOURCE_DIR}/res/fonts/fonts
 setup_hifi_library(Widgets OpenGL Network Script)
 
 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 2c325e4daf..4e13ddf513 100644
--- a/libraries/script-engine/CMakeLists.txt
+++ b/libraries/script-engine/CMakeLists.txt
@@ -4,6 +4,7 @@ set(TARGET_NAME script-engine)
 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})
 
 link_hifi_libraries(shared octree gpu model fbx entities animation audio physics metavoxels)
diff --git a/tests/physics/CMakeLists.txt b/tests/physics/CMakeLists.txt
index 89fba47bea..e20f323392 100644
--- a/tests/physics/CMakeLists.txt
+++ b/tests/physics/CMakeLists.txt
@@ -3,6 +3,7 @@ set(TARGET_NAME physics-tests)
 setup_hifi_project()
 
 add_dependency_external_project(glm)
+find_package(GLM REQUIRED)
 target_include_directories(${TARGET_NAME} PUBLIC ${GLM_INCLUDE_DIRS})
 
 include_bullet()

From 6e63c1c1ad2e26e976cd9585b071d10c01b32b53 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 13 Feb 2015 14:50:12 -0800
Subject: [PATCH 23/34] set the GLM_INCLUDE_DIRS var in cache so find hits it

---
 cmake/externals/glm/CMakeLists.txt              | 12 ++++++++----
 cmake/macros/AddDependencyExternalProject.cmake |  3 ---
 cmake/modules/FindGLM.cmake                     |  4 +---
 libraries/shared/CMakeLists.txt                 |  4 ++++
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/cmake/externals/glm/CMakeLists.txt b/cmake/externals/glm/CMakeLists.txt
index a3b64b9370..8bf597ecc3 100644
--- a/cmake/externals/glm/CMakeLists.txt
+++ b/cmake/externals/glm/CMakeLists.txt
@@ -1,11 +1,15 @@
+set(EXTERNAL_NAME glm)
+
 include(ExternalProject)
 ExternalProject_Add(
-  glm
-  PREFIX glm
+  ${EXTERNAL_NAME}
+  PREFIX ${EXTERNAL_NAME}
   URL https://github.com/g-truc/glm/archive/0.9.5.4.zip
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
   LOG_DOWNLOAD ON
 )
-ExternalProject_Get_Property(glm install_dir)
 
-export(TARGETS glm FILE ${CMAKE_BINARY_DIR}/glm-config.cmake)
\ No newline at end of file
+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/macros/AddDependencyExternalProject.cmake b/cmake/macros/AddDependencyExternalProject.cmake
index c4c2c0d005..71c32e5e69 100644
--- a/cmake/macros/AddDependencyExternalProject.cmake
+++ b/cmake/macros/AddDependencyExternalProject.cmake
@@ -21,8 +21,5 @@ macro(ADD_DEPENDENCY_EXTERNAL_PROJECT _PROJ_NAME)
     add_subdirectory(${EXTERNAL_PROJECT_DIR}/${_PROJ_NAME} ${_PROJ_BINARY_DIR})
   endif ()
   
-  string(TOUPPER ${_PROJ_NAME} _PROJ_NAME_UPPER)
-  get_target_property(${_PROJ_NAME_UPPER}_INCLUDE_DIRS ${_PROJ_NAME} INCLUDE_DIRS)
-  
   add_dependencies(${TARGET_NAME} ${_PROJ_NAME})
 endmacro()
\ 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/libraries/shared/CMakeLists.txt b/libraries/shared/CMakeLists.txt
index 0bbb39fdb5..5af2343ec2 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} PRIVATE ${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

From ab0692229d7952ab359cfe824a2ee49efdfb9d28 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 13 Feb 2015 14:54:21 -0800
Subject: [PATCH 24/34] 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

From 430083681019cdb7cc785a1ff142a4a1ee36fb59 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 13 Feb 2015 15:47:35 -0800
Subject: [PATCH 25/34] make gverb a cmake external project

---
 cmake/externals/glm/CMakeLists.txt            |  4 +--
 cmake/externals/gverb/CMakeLists.txt          | 16 ++++++++++++
 cmake/modules/FindGverb.cmake                 | 26 +++++--------------
 libraries/audio-client/CMakeLists.txt         | 12 +++------
 .../audio-client/external/gverb/readme.txt    | 14 ----------
 libraries/audio-client/src/AudioClient.cpp    |  5 ++++
 libraries/audio-client/src/AudioClient.h      |  6 ++---
 7 files changed, 35 insertions(+), 48 deletions(-)
 create mode 100644 cmake/externals/gverb/CMakeLists.txt
 delete mode 100644 libraries/audio-client/external/gverb/readme.txt

diff --git a/cmake/externals/glm/CMakeLists.txt b/cmake/externals/glm/CMakeLists.txt
index 8bf597ecc3..928603ecd2 100644
--- a/cmake/externals/glm/CMakeLists.txt
+++ b/cmake/externals/glm/CMakeLists.txt
@@ -9,7 +9,7 @@ ExternalProject_Add(
   LOG_DOWNLOAD ON
 )
 
-ExternalProject_Get_Property(${EXTERNAL_NAME} install_dir)
+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
+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..1954df703e
--- /dev/null
+++ b/cmake/externals/gverb/CMakeLists.txt
@@ -0,0 +1,16 @@
+set(EXTERNAL_NAME gverb)
+
+include(ExternalProject)
+ExternalProject_Add(
+  ${EXTERNAL_NAME}
+  PREFIX ${EXTERNAL_NAME}
+  GIT_REPOSITORY https://github.com/birarda/gverb.git
+  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)
+set(${EXTERNAL_NAME_UPPER}_LIBRARIES ${INSTALL_DIR}/lib/libgverb.a CACHE TYPE STRING)
\ No newline at end of file
diff --git a/cmake/modules/FindGverb.cmake b/cmake/modules/FindGverb.cmake
index d4d2377c94..7dc233333c 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_path(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/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 1919f2bbe5..391d6aaf40 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 e55a116e06..dc4e16d81b 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)();

From 48e7aa74330135185ffcd49a4f9bb2444487d0b2 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 13 Feb 2015 16:06:30 -0800
Subject: [PATCH 26/34] handle android build of gverb for external project

---
 cmake/externals/gverb/CMakeLists.txt | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/cmake/externals/gverb/CMakeLists.txt b/cmake/externals/gverb/CMakeLists.txt
index 1954df703e..373089eb2d 100644
--- a/cmake/externals/gverb/CMakeLists.txt
+++ b/cmake/externals/gverb/CMakeLists.txt
@@ -1,11 +1,15 @@
 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 -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
+  CMAKE_ARGS ${ANDROID_CMAKE_ARGS} -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
   LOG_DOWNLOAD ON
 )
 

From d337cadb106f8787ac40f1afe8b0c50fd023e3c4 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 13 Feb 2015 16:12:03 -0800
Subject: [PATCH 27/34] add gverb to list of auto-deps

---
 BUILD.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/BUILD.md b/BUILD.md
index 3065254529..f7dc22882a 100644
--- a/BUILD.md
+++ b/BUILD.md
@@ -14,6 +14,7 @@
 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.

From 691cf2d893ba783a589615b996aef751eb192f78 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 13 Feb 2015 16:12:47 -0800
Subject: [PATCH 28/34] remove gverb from win build guide

---
 BUILD_WIN.md | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/BUILD_WIN.md b/BUILD_WIN.md
index ebc0b60f25..6f26e8c809 100644
--- a/BUILD_WIN.md
+++ b/BUILD_WIN.md
@@ -126,20 +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`
 
-###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.

From 28fabcb7884670eb3c562de570c9ca68130431cf Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 13 Feb 2015 16:17:45 -0800
Subject: [PATCH 29/34] avoid ubuntu libssl error by using http links

---
 cmake/externals/glm/CMakeLists.txt   | 2 +-
 cmake/externals/gverb/CMakeLists.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cmake/externals/glm/CMakeLists.txt b/cmake/externals/glm/CMakeLists.txt
index 928603ecd2..4c9745af9f 100644
--- a/cmake/externals/glm/CMakeLists.txt
+++ b/cmake/externals/glm/CMakeLists.txt
@@ -4,7 +4,7 @@ include(ExternalProject)
 ExternalProject_Add(
   ${EXTERNAL_NAME}
   PREFIX ${EXTERNAL_NAME}
-  URL https://github.com/g-truc/glm/archive/0.9.5.4.zip
+  URL http://github.com/g-truc/glm/archive/0.9.5.4.zip
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
   LOG_DOWNLOAD ON
 )
diff --git a/cmake/externals/gverb/CMakeLists.txt b/cmake/externals/gverb/CMakeLists.txt
index 373089eb2d..bd461d349e 100644
--- a/cmake/externals/gverb/CMakeLists.txt
+++ b/cmake/externals/gverb/CMakeLists.txt
@@ -8,7 +8,7 @@ include(ExternalProject)
 ExternalProject_Add(
   ${EXTERNAL_NAME}
   PREFIX ${EXTERNAL_NAME}
-  GIT_REPOSITORY https://github.com/birarda/gverb.git
+  GIT_REPOSITORY http://github.com/birarda/gverb.git
   CMAKE_ARGS ${ANDROID_CMAKE_ARGS} -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
   LOG_DOWNLOAD ON
 )

From 018b8497bddee1b64a8196975e492d0131221ff5 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 13 Feb 2015 16:21:19 -0800
Subject: [PATCH 30/34] use non-redirecting glm link to avoid https error

---
 cmake/externals/glm/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmake/externals/glm/CMakeLists.txt b/cmake/externals/glm/CMakeLists.txt
index 4c9745af9f..b1aed7dd7f 100644
--- a/cmake/externals/glm/CMakeLists.txt
+++ b/cmake/externals/glm/CMakeLists.txt
@@ -4,7 +4,7 @@ include(ExternalProject)
 ExternalProject_Add(
   ${EXTERNAL_NAME}
   PREFIX ${EXTERNAL_NAME}
-  URL http://github.com/g-truc/glm/archive/0.9.5.4.zip
+  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
 )

From 9683ed92e321cdec5b7607a03f0bf08dd1753fd5 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 13 Feb 2015 16:40:48 -0800
Subject: [PATCH 31/34] use proper lib path on WIN32 for gverb

---
 cmake/externals/gverb/CMakeLists.txt | 9 +++++++--
 cmake/modules/FindGverb.cmake        | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/cmake/externals/gverb/CMakeLists.txt b/cmake/externals/gverb/CMakeLists.txt
index bd461d349e..19a44781b1 100644
--- a/cmake/externals/gverb/CMakeLists.txt
+++ b/cmake/externals/gverb/CMakeLists.txt
@@ -8,7 +8,7 @@ include(ExternalProject)
 ExternalProject_Add(
   ${EXTERNAL_NAME}
   PREFIX ${EXTERNAL_NAME}
-  GIT_REPOSITORY http://github.com/birarda/gverb.git
+  GIT_REPOSITORY https://github.com/birarda/gverb.git
   CMAKE_ARGS ${ANDROID_CMAKE_ARGS} -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
   LOG_DOWNLOAD ON
 )
@@ -17,4 +17,9 @@ 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)
-set(${EXTERNAL_NAME_UPPER}_LIBRARIES ${INSTALL_DIR}/lib/libgverb.a CACHE TYPE STRING)
\ No newline at end of file
+
+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/modules/FindGverb.cmake b/cmake/modules/FindGverb.cmake
index 7dc233333c..e54fba8083 100644
--- a/cmake/modules/FindGverb.cmake
+++ b/cmake/modules/FindGverb.cmake
@@ -19,7 +19,7 @@ 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_path(GVERB_LIBRARIES gverb PATH_SUFFIXES lib HINTS ${GVERB_SEARCH_DIRS})
+find_library(GVERB_LIBRARIES gverb PATH_SUFFIXES lib HINTS ${GVERB_SEARCH_DIRS})
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(GVERB DEFAULT_MSG GVERB_INCLUDE_DIRS GVERB_LIBRARIES)
\ No newline at end of file

From a1bf06f004406a3800c76e1d1e65d848993cbd5d Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Mon, 16 Feb 2015 09:10:18 -0800
Subject: [PATCH 32/34] can't use find module for external proj

---
 cmake/macros/HifiLibrarySearchHints.cmake | 2 --
 1 file changed, 2 deletions(-)

diff --git a/cmake/macros/HifiLibrarySearchHints.cmake b/cmake/macros/HifiLibrarySearchHints.cmake
index e4b67af15e..2eed364a68 100644
--- a/cmake/macros/HifiLibrarySearchHints.cmake
+++ b/cmake/macros/HifiLibrarySearchHints.cmake
@@ -11,8 +11,6 @@
 macro(HIFI_LIBRARY_SEARCH_HINTS LIBRARY_FOLDER)
   string(TOUPPER ${LIBRARY_FOLDER} LIBRARY_PREFIX)
   
-  set(${LIBRARY_PREFIX}_SEARCH_DIRS "${EXTERNAL_PROJECT_DIR}/${LIBRARY_FOLDER}/build/${LIBRARY_FOLDER}")
-  
   if (${LIBRARY_PREFIX}_ROOT_DIR)
     list(APPEND ${LIBRARY_PREFIX}_SEARCH_DIRS "${${LIBRARY_PREFIX}_ROOT_DIR}")
   endif ()

From feaad377514864c1b5347b532566923a66d32173 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Mon, 16 Feb 2015 09:38:53 -0800
Subject: [PATCH 33/34] add a GET_PROJ_NAME var to skip external projects

---
 .../macros/AddDependencyExternalProject.cmake | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/cmake/macros/AddDependencyExternalProject.cmake b/cmake/macros/AddDependencyExternalProject.cmake
index 71c32e5e69..9e958b030b 100644
--- a/cmake/macros/AddDependencyExternalProject.cmake
+++ b/cmake/macros/AddDependencyExternalProject.cmake
@@ -10,16 +10,23 @@
 # 
 
 macro(ADD_DEPENDENCY_EXTERNAL_PROJECT _PROJ_NAME)
-  if (NOT TARGET ${_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})
     
-    if (ANDROID)
-      set(_PROJ_BINARY_DIR ${EXTERNAL_PROJECT_DIR}/${_PROJ_NAME}/build/android)
-    else ()
-      set(_PROJ_BINARY_DIR ${EXTERNAL_PROJECT_DIR}/${_PROJ_NAME}/build)
+      if (ANDROID)
+        set(_PROJ_BINARY_DIR ${EXTERNAL_PROJECT_DIR}/${_PROJ_NAME}/build/android)
+      else ()
+        set(_PROJ_BINARY_DIR ${EXTERNAL_PROJECT_DIR}/${_PROJ_NAME}/build)
+      endif ()
+    
+      add_subdirectory(${EXTERNAL_PROJECT_DIR}/${_PROJ_NAME} ${_PROJ_BINARY_DIR})
     endif ()
+  
+    add_dependencies(${TARGET_NAME} ${_PROJ_NAME})
     
-    add_subdirectory(${EXTERNAL_PROJECT_DIR}/${_PROJ_NAME} ${_PROJ_BINARY_DIR})
   endif ()
   
-  add_dependencies(${TARGET_NAME} ${_PROJ_NAME})
 endmacro()
\ No newline at end of file

From d299f015d1f7e2e549cb14b869e34b5a4fe6a146 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Tue, 17 Feb 2015 09:46:39 -0800
Subject: [PATCH 34/34] use binary dir for externals as well

---
 cmake/macros/AddDependencyExternalProject.cmake | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/cmake/macros/AddDependencyExternalProject.cmake b/cmake/macros/AddDependencyExternalProject.cmake
index 9e958b030b..ff0ced411e 100644
--- a/cmake/macros/AddDependencyExternalProject.cmake
+++ b/cmake/macros/AddDependencyExternalProject.cmake
@@ -14,15 +14,8 @@ 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})
-    
-      if (ANDROID)
-        set(_PROJ_BINARY_DIR ${EXTERNAL_PROJECT_DIR}/${_PROJ_NAME}/build/android)
-      else ()
-        set(_PROJ_BINARY_DIR ${EXTERNAL_PROJECT_DIR}/${_PROJ_NAME}/build)
-      endif ()
-    
-      add_subdirectory(${EXTERNAL_PROJECT_DIR}/${_PROJ_NAME} ${_PROJ_BINARY_DIR})
+    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})