From 673e1ee0cc2fb4e1cd223ac1e287fc9ab11cb2e4 Mon Sep 17 00:00:00 2001
From: ZappoMan <bradh@konamoxt.com>
Date: Thu, 18 Jun 2015 09:30:34 -0700
Subject: [PATCH 1/2] first cut and removing openGl dependency in shared

---
 libraries/{shared => render-utils}/src/OglplusHelpers.cpp | 0
 libraries/{shared => render-utils}/src/OglplusHelpers.h   | 0
 libraries/shared/CMakeLists.txt                           | 2 +-
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename libraries/{shared => render-utils}/src/OglplusHelpers.cpp (100%)
 rename libraries/{shared => render-utils}/src/OglplusHelpers.h (100%)

diff --git a/libraries/shared/src/OglplusHelpers.cpp b/libraries/render-utils/src/OglplusHelpers.cpp
similarity index 100%
rename from libraries/shared/src/OglplusHelpers.cpp
rename to libraries/render-utils/src/OglplusHelpers.cpp
diff --git a/libraries/shared/src/OglplusHelpers.h b/libraries/render-utils/src/OglplusHelpers.h
similarity index 100%
rename from libraries/shared/src/OglplusHelpers.h
rename to libraries/render-utils/src/OglplusHelpers.h
diff --git a/libraries/shared/CMakeLists.txt b/libraries/shared/CMakeLists.txt
index c4159b1190..0b3ad05e7e 100644
--- a/libraries/shared/CMakeLists.txt
+++ b/libraries/shared/CMakeLists.txt
@@ -2,7 +2,7 @@ set(TARGET_NAME shared)
 
 # use setup_hifi_library macro to setup our project and link appropriate Qt modules
 # 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 OpenGL Script Widgets)
+setup_hifi_library(Gui Network Script Widgets)
 
 setup_hifi_opengl()
 

From 383a2c3d639746a561a36fa417f3431e3b0761aa Mon Sep 17 00:00:00 2001
From: ZappoMan <bradh@konamoxt.com>
Date: Thu, 18 Jun 2015 09:43:39 -0700
Subject: [PATCH 2/2] another attempt

---
 libraries/render-utils/CMakeLists.txt | 64 ++++++++++++++++-----------
 libraries/shared/CMakeLists.txt       | 11 -----
 2 files changed, 37 insertions(+), 38 deletions(-)

diff --git a/libraries/render-utils/CMakeLists.txt b/libraries/render-utils/CMakeLists.txt
index 373279b299..7feb48a52b 100644
--- a/libraries/render-utils/CMakeLists.txt
+++ b/libraries/render-utils/CMakeLists.txt
@@ -1,27 +1,37 @@
-set(TARGET_NAME render-utils)
-
-AUTOSCRIBE_SHADER_LIB(gpu model render)
-
-# pull in the resources.qrc file
-qt5_add_resources(QT_RESOURCES_FILE "${CMAKE_CURRENT_SOURCE_DIR}/res/fonts/fonts.qrc")
-
-# use setup_hifi_library macro to setup our project and link appropriate Qt modules
-setup_hifi_library(Widgets OpenGL Network Qml Quick Script)
-
-add_dependency_external_projects(glm)
-find_package(GLM REQUIRED)
-target_include_directories(${TARGET_NAME} PUBLIC ${GLM_INCLUDE_DIRS})
-
-if (WIN32)
-  if (USE_NSIGHT)
-    # try to find the Nsight package and add it to the build if we find it
-    find_package(NSIGHT)
-    if (NSIGHT_FOUND)
-      include_directories(${NSIGHT_INCLUDE_DIRS})
-      add_definitions(-DNSIGHT_FOUND)
-      target_link_libraries(${TARGET_NAME} "${NSIGHT_LIBRARIES}")
-    endif ()
-  endif()
-endif (WIN32)
-
-link_hifi_libraries(animation fbx shared gpu model render)
+set(TARGET_NAME render-utils)
+
+AUTOSCRIBE_SHADER_LIB(gpu model render)
+
+# pull in the resources.qrc file
+qt5_add_resources(QT_RESOURCES_FILE "${CMAKE_CURRENT_SOURCE_DIR}/res/fonts/fonts.qrc")
+
+# use setup_hifi_library macro to setup our project and link appropriate Qt modules
+setup_hifi_library(Widgets OpenGL Network Qml Quick Script)
+
+setup_hifi_opengl()
+
+add_dependency_external_projects(glm)
+find_package(GLM REQUIRED)
+target_include_directories(${TARGET_NAME} PUBLIC ${GLM_INCLUDE_DIRS})
+
+if (WIN32)
+  if (USE_NSIGHT)
+    # try to find the Nsight package and add it to the build if we find it
+    find_package(NSIGHT)
+    if (NSIGHT_FOUND)
+      include_directories(${NSIGHT_INCLUDE_DIRS})
+      add_definitions(-DNSIGHT_FOUND)
+      target_link_libraries(${TARGET_NAME} "${NSIGHT_LIBRARIES}")
+    endif ()
+  endif()
+
+  add_dependency_external_projects(boostconfig)
+  find_package(BoostConfig REQUIRED)
+  target_include_directories(${TARGET_NAME} PUBLIC ${BOOSTCONFIG_INCLUDE_DIRS})
+
+  add_dependency_external_projects(oglplus)
+  find_package(OGLPLUS REQUIRED)
+  target_include_directories(${TARGET_NAME} PUBLIC ${OGLPLUS_INCLUDE_DIRS})
+endif (WIN32)
+
+link_hifi_libraries(animation fbx shared gpu model render)
diff --git a/libraries/shared/CMakeLists.txt b/libraries/shared/CMakeLists.txt
index 0b3ad05e7e..8deda7f4b1 100644
--- a/libraries/shared/CMakeLists.txt
+++ b/libraries/shared/CMakeLists.txt
@@ -4,18 +4,7 @@ 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)
 
-setup_hifi_opengl()
-
 add_dependency_external_projects(glm)
 find_package(GLM REQUIRED)
 target_include_directories(${TARGET_NAME} PUBLIC ${GLM_INCLUDE_DIRS})
 
-if (WIN32)
-    add_dependency_external_projects(boostconfig)
-    find_package(BoostConfig REQUIRED)
-    target_include_directories(${TARGET_NAME} PUBLIC ${BOOSTCONFIG_INCLUDE_DIRS})
-
-    add_dependency_external_projects(oglplus)
-    find_package(OGLPLUS REQUIRED)
-    target_include_directories(${TARGET_NAME} PUBLIC ${OGLPLUS_INCLUDE_DIRS})
-endif()
\ No newline at end of file