From 9601e09ba9301005057a608893e82e23f7734427 Mon Sep 17 00:00:00 2001
From: Sam Gateau <sam@highfidelity.io>
Date: Wed, 29 Jul 2015 14:42:24 -0700
Subject: [PATCH] A simpler way to add the NSIGHT_FOUND define to all the
 projects depending on GPU

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

diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt
index d47395a810..f1ef38ade9 100644
--- a/interface/CMakeLists.txt
+++ b/interface/CMakeLists.txt
@@ -221,14 +221,8 @@ else (APPLE)
 
   # link target to external libraries
   if (WIN32)
+  #  target_link_libraries(${TARGET_NAME} wsock32.lib Winmm.lib)
     target_link_libraries(${TARGET_NAME} wsock32.lib Winmm.lib)
-    
-    if (USE_NSIGHT)
-      # If required NSIGHT lib comes from gpu lib but still to add a precroc define
-      if (NSIGHT_FOUND)
-        add_definitions(-DNSIGHT_FOUND)
-      endif ()
-    endif()
   else (WIN32)
     # Nothing else required on linux apparently
   endif()
diff --git a/libraries/gpu/CMakeLists.txt b/libraries/gpu/CMakeLists.txt
index 1e8faf1bca..89939535b0 100644
--- a/libraries/gpu/CMakeLists.txt
+++ b/libraries/gpu/CMakeLists.txt
@@ -21,10 +21,11 @@ elseif (WIN32)
 
   if (USE_NSIGHT)
     # try to find the Nsight package and add it to the build if we find it
+    # note that this will also enable NSIGHT profilers in all the projects linking gpu
     find_package(NSIGHT)
     if (NSIGHT_FOUND)
       target_include_directories(${TARGET_NAME} PUBLIC ${NSIGHT_INCLUDE_DIRS})
-      add_definitions(-DNSIGHT_FOUND)
+      target_compile_definitions(${TARGET_NAME} PUBLIC NSIGHT_FOUND)
       target_link_libraries(${TARGET_NAME} "${NSIGHT_LIBRARIES}")
     endif ()
   endif()
@@ -39,8 +40,7 @@ else ()
   if (${OPENGL_INCLUDE_DIR})
     include_directories(SYSTEM "${OPENGL_INCLUDE_DIR}")
   endif ()
-  
+
   target_link_libraries(${TARGET_NAME} "${GLEW_LIBRARIES}" "${OPENGL_LIBRARY}")
-  
-  #  target_include_directories(${TARGET_NAME} PUBLIC ${OPENGL_INCLUDE_DIR})
+
 endif (APPLE)