From 661f29924fd79f6be76468ff5f6376b8153db557 Mon Sep 17 00:00:00 2001
From: Sam Gateau <sam@highfidelity.io>
Date: Wed, 29 Jul 2015 13:55:26 -0700
Subject: [PATCH] Clean up the cmakelist to normally onlly do th eminimal
 linking and include for gl

---
 interface/CMakeLists.txt     | 29 ++++-------------------------
 libraries/gpu/CMakeLists.txt |  2 +-
 2 files changed, 5 insertions(+), 26 deletions(-)

diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt
index 4f99b6b34f..b6c8e3f3f4 100644
--- a/interface/CMakeLists.txt
+++ b/interface/CMakeLists.txt
@@ -218,40 +218,19 @@ else (APPLE)
     "${PROJECT_SOURCE_DIR}/resources"
     $<TARGET_FILE_DIR:${TARGET_NAME}>/resources
   )
-    
- # find_package(OpenGL REQUIRED)
-  
- # if (${OPENGL_INCLUDE_DIR})
- #   include_directories(SYSTEM "${OPENGL_INCLUDE_DIR}")
-#  endif ()
-  
- # target_link_libraries(${TARGET_NAME} "${OPENGL_LIBRARY}")
-  
+
   # link target to external libraries
   if (WIN32)
-  #  add_dependency_external_projects(glew)
-   # find_package(GLEW REQUIRED)
-   # target_include_directories(${TARGET_NAME} PRIVATE ${GLEW_INCLUDE_DIRS})
-
-    # target_link_libraries(${TARGET_NAME} ${GLEW_LIBRARIES} wsock32.lib opengl32.lib Winmm.lib)
     target_link_libraries(${TARGET_NAME} wsock32.lib Winmm.lib)
-
+    
     if (USE_NSIGHT)
-      # try to find the Nsight package and add it to the build if we find it
-      find_package(NSIGHT)
+      # If required NSIGHT lib comes from gpu lib but still to add a precroc define
       if (NSIGHT_FOUND)
-        include_directories(${NSIGHT_INCLUDE_DIRS})
         add_definitions(-DNSIGHT_FOUND)
-        target_link_libraries(${TARGET_NAME} "${NSIGHT_LIBRARIES}")
       endif ()
     endif()
-
   else (WIN32)
-    find_package(GLEW REQUIRED)
-    target_include_directories(${TARGET_NAME} PRIVATE ${GLEW_INCLUDE_DIRS})
-
-    target_link_libraries(${TARGET_NAME} ${GLEW_LIBRARIES})
-    message(STATUS ${GLEW_LIBRARY})
+    # Nothing else required on linux apparently
   endif()
 endif (APPLE)
 
diff --git a/libraries/gpu/CMakeLists.txt b/libraries/gpu/CMakeLists.txt
index eda168091e..1e8faf1bca 100644
--- a/libraries/gpu/CMakeLists.txt
+++ b/libraries/gpu/CMakeLists.txt
@@ -23,7 +23,7 @@ elseif (WIN32)
     # 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})
+      target_include_directories(${TARGET_NAME} PUBLIC ${NSIGHT_INCLUDE_DIRS})
       add_definitions(-DNSIGHT_FOUND)
       target_link_libraries(${TARGET_NAME} "${NSIGHT_LIBRARIES}")
     endif ()