From fb3bf163913a2fa7cb79a8c85354c22950cf0274 Mon Sep 17 00:00:00 2001
From: Brad Hefta-Gaub <brad@highfidelity.io>
Date: Fri, 30 Oct 2015 09:01:42 -0700
Subject: [PATCH] improvement to cmake to explicitly use local external
 dependency

---
 CMakeLists.txt                                   | 15 ---------------
 cmake/macros/AddDependencyExternalProjects.cmake |  2 +-
 2 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 11ef4752f5..efe99b550b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -185,21 +185,6 @@ set(EXTERNAL_PROJECT_PREFIX "project")
 set_property(DIRECTORY PROPERTY EP_PREFIX ${EXTERNAL_PROJECT_PREFIX})
 setup_externals_binary_dir()
 
-# setup options to grab external project dependencies
-option(GET_BULLET "Get Bullet library automatically as external project" 1)
-option(GET_GLM "Get GLM library automatically as external project" 1)
-option(GET_GVERB "Get Gverb library automatically as external project" 1)
-option(GET_TBB "Get Threading Building Blocks library automatically as external project" 1)
-option(GET_LIBOVR "Get LibOVR library automatically as external project" 1)
-option(GET_VHACD "Get V-HACD library automatically as external project" 1)
-option(GET_POLYVOX "Get polyvox library automatically as external project" 1)
-option(GET_OPENVR "Get OpenVR library automatically as external project" 1)
-option(GET_BOOSTCONFIG "Get Boost-config library automatically as external project" 1)
-option(GET_OGLPLUS "Get OGLplus library automatically as external project" 1)
-option(GET_GLEW "Get GLEW library automatically as external project" 1)
-option(GET_SDL2 "Get SDL2 library automatically as external project" 1)
-option(GET_SIXENSE "Get Sixense library automatically as external project" 1)
-
 option(USE_NSIGHT "Attempt to find the nSight libraries" 1)
 
 
diff --git a/cmake/macros/AddDependencyExternalProjects.cmake b/cmake/macros/AddDependencyExternalProjects.cmake
index e8292c3198..e35ca98959 100644
--- a/cmake/macros/AddDependencyExternalProjects.cmake
+++ b/cmake/macros/AddDependencyExternalProjects.cmake
@@ -16,7 +16,7 @@ macro(ADD_DEPENDENCY_EXTERNAL_PROJECTS)
     string(TOUPPER ${_PROJ_NAME} _PROJ_NAME_UPPER)
     
     # has the user told us they specific don't want this as an external project?
-    if (NOT DISABLE_${_PROJ_NAME_UPPER})
+    if (NOT USE_LOCAL_${_PROJ_NAME_UPPER})
       # have we already detected we can't have this as external project on this OS?
       if (NOT DEFINED ${_PROJ_NAME_UPPER}_EXTERNAL_PROJECT OR ${_PROJ_NAME_UPPER}_EXTERNAL_PROJECT)
         # have we already setup the target?