From 7ff576ef1897b97ba4a05f3c804e6f060d108637 Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Thu, 22 Jun 2017 10:07:39 -0700
Subject: [PATCH 1/4] add memory-debugging macro to some cmake files

---
 assignment-client/CMakeLists.txt | 2 ++
 domain-server/CMakeLists.txt     | 2 ++
 ice-server/CMakeLists.txt        | 2 ++
 interface/CMakeLists.txt         | 2 ++
 libraries/gl/CMakeLists.txt      | 1 +
 tests/controllers/CMakeLists.txt | 4 +++-
 tests/qt59/CMakeLists.txt        | 4 +++-
 tests/recording/CMakeLists.txt   | 1 +
 tools/vhacd-util/CMakeLists.txt  | 2 ++
 9 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/assignment-client/CMakeLists.txt b/assignment-client/CMakeLists.txt
index 54afabfd21..6b3101f4e3 100644
--- a/assignment-client/CMakeLists.txt
+++ b/assignment-client/CMakeLists.txt
@@ -7,6 +7,8 @@ if (APPLE)
   set_target_properties(${TARGET_NAME} PROPERTIES INSTALL_RPATH "@executable_path/../Frameworks")
 endif ()
 
+setup_memory_debugger()
+
 # link in the shared libraries
 link_hifi_libraries(
   audio avatars octree gpu model fbx entities
diff --git a/domain-server/CMakeLists.txt b/domain-server/CMakeLists.txt
index 2ce537a5a0..c1e275e4d3 100644
--- a/domain-server/CMakeLists.txt
+++ b/domain-server/CMakeLists.txt
@@ -14,6 +14,8 @@ if (APPLE)
   set_target_properties(${TARGET_NAME} PROPERTIES INSTALL_RPATH "@executable_path/../Frameworks")
 endif ()
 
+setup_memory_debugger()
+
 # TODO: find a solution that will handle web file changes in resources on windows without a re-build.
 # Currently the resources are only copied on post-build. If one is changed but the domain-server is not, they will
 # not be re-copied. This is worked-around on OS X/UNIX by using a symlink.
diff --git a/ice-server/CMakeLists.txt b/ice-server/CMakeLists.txt
index e5bdffe2e2..07b90b369e 100644
--- a/ice-server/CMakeLists.txt
+++ b/ice-server/CMakeLists.txt
@@ -18,5 +18,7 @@ endif ()
 
 include_directories(SYSTEM "${OPENSSL_INCLUDE_DIR}")
 
+setup_memory_debugger()
+
 # append OpenSSL to our list of libraries to link
 target_link_libraries(${TARGET_NAME} ${OPENSSL_LIBRARIES})
diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt
index 71341f3f11..fe42b1432b 100644
--- a/interface/CMakeLists.txt
+++ b/interface/CMakeLists.txt
@@ -356,6 +356,8 @@ if (ANDROID)
   qt_create_apk()
 endif ()
 
+setup_memory_debugger()
+
 add_dependency_external_projects(GifCreator)
 find_package(GifCreator REQUIRED)
 target_include_directories(${TARGET_NAME} PUBLIC ${GIFCREATOR_INCLUDE_DIRS})
diff --git a/libraries/gl/CMakeLists.txt b/libraries/gl/CMakeLists.txt
index fd3197410b..0a0ca2fc5f 100644
--- a/libraries/gl/CMakeLists.txt
+++ b/libraries/gl/CMakeLists.txt
@@ -1,5 +1,6 @@
 set(TARGET_NAME gl)
 setup_hifi_library(OpenGL Qml Quick)
+setup_memory_debugger()
 link_hifi_libraries(shared networking)
 
 target_opengl()
diff --git a/tests/controllers/CMakeLists.txt b/tests/controllers/CMakeLists.txt
index 3aac4db0a8..3221070837 100644
--- a/tests/controllers/CMakeLists.txt
+++ b/tests/controllers/CMakeLists.txt
@@ -5,6 +5,8 @@ set(TARGET_NAME controllers-test)
 setup_hifi_project(Script Qml)
 set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "Tests/manual-tests/")
 
+setup_memory_debugger()
+
 # link in the shared libraries
 link_hifi_libraries(shared gl script-engine plugins render-utils ui-plugins input-plugins display-plugins controllers)
 
@@ -16,4 +18,4 @@ if (WIN32)
     target_link_libraries(${TARGET_NAME} ${OPENVR_LIBRARIES})
 endif()
 
-package_libraries_for_deployment()
\ No newline at end of file
+package_libraries_for_deployment()
diff --git a/tests/qt59/CMakeLists.txt b/tests/qt59/CMakeLists.txt
index 32cc125ecf..e0e8138a1e 100644
--- a/tests/qt59/CMakeLists.txt
+++ b/tests/qt59/CMakeLists.txt
@@ -1,10 +1,12 @@
 
 set(TARGET_NAME qt59)
- 
+
 if (WIN32)
   SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /ignore:4049 /ignore:4217")
 endif()
 
+setup_memory_debugger()
+
 # This is not a testcase -- just set it up as a regular hifi project
 setup_hifi_project(Gui)
 set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "Tests/manual-tests/")
diff --git a/tests/recording/CMakeLists.txt b/tests/recording/CMakeLists.txt
index 4e881fcbd9..b5b1e6a54e 100644
--- a/tests/recording/CMakeLists.txt
+++ b/tests/recording/CMakeLists.txt
@@ -2,6 +2,7 @@ set(TARGET_NAME recording-test)
 # This is not a testcase -- just set it up as a regular hifi project
 setup_hifi_project(Test)
 set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "Tests/manual-tests/")
+setup_memory_debugger()
 link_hifi_libraries(shared recording)
 package_libraries_for_deployment()
 
diff --git a/tools/vhacd-util/CMakeLists.txt b/tools/vhacd-util/CMakeLists.txt
index 810d13ffd7..c28aa9efa4 100644
--- a/tools/vhacd-util/CMakeLists.txt
+++ b/tools/vhacd-util/CMakeLists.txt
@@ -8,6 +8,8 @@ find_package(VHACD REQUIRED)
 target_include_directories(${TARGET_NAME} PUBLIC ${VHACD_INCLUDE_DIRS})
 target_link_libraries(${TARGET_NAME} ${VHACD_LIBRARIES})
 
+setup_memory_debugger()
+
 if (UNIX AND NOT APPLE)
   include(FindOpenMP)
   if(OPENMP_FOUND)

From 9ce173f682cf04a8fb3e32bd2f1d65503e639884 Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Thu, 22 Jun 2017 10:56:08 -0700
Subject: [PATCH 2/4] missed a few

---
 tools/ac-client/CMakeLists.txt     | 1 +
 tools/atp-get/CMakeLists.txt       | 1 +
 tools/skeleton-dump/CMakeLists.txt | 1 +
 3 files changed, 3 insertions(+)

diff --git a/tools/ac-client/CMakeLists.txt b/tools/ac-client/CMakeLists.txt
index 9e623b02e9..24eeadba9c 100644
--- a/tools/ac-client/CMakeLists.txt
+++ b/tools/ac-client/CMakeLists.txt
@@ -1,3 +1,4 @@
 set(TARGET_NAME ac-client)
 setup_hifi_project(Core Widgets)
+setup_memory_debugger()
 link_hifi_libraries(shared networking)
diff --git a/tools/atp-get/CMakeLists.txt b/tools/atp-get/CMakeLists.txt
index b1646dc023..75f92b787d 100644
--- a/tools/atp-get/CMakeLists.txt
+++ b/tools/atp-get/CMakeLists.txt
@@ -1,3 +1,4 @@
 set(TARGET_NAME atp-get)
 setup_hifi_project(Core Widgets)
+setup_memory_debugger()
 link_hifi_libraries(shared networking)
diff --git a/tools/skeleton-dump/CMakeLists.txt b/tools/skeleton-dump/CMakeLists.txt
index 04d450d9c2..bb2fe24f51 100644
--- a/tools/skeleton-dump/CMakeLists.txt
+++ b/tools/skeleton-dump/CMakeLists.txt
@@ -1,4 +1,5 @@
 set(TARGET_NAME skeleton-dump)
 setup_hifi_project(Core Widgets)
+setup_memory_debugger()
 link_hifi_libraries(shared fbx model gpu gl animation)
 

From a053a1da4ba402cbcae380ba91c837d5a08a866c Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Thu, 22 Jun 2017 13:50:46 -0700
Subject: [PATCH 3/4] more HIFI_MEMORY_DEBUGGING fixes

---
 libraries/gl/CMakeLists.txt     | 1 -
 tests/entities/CMakeLists.txt   | 2 +-
 tools/ice-client/CMakeLists.txt | 1 +
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/gl/CMakeLists.txt b/libraries/gl/CMakeLists.txt
index 0a0ca2fc5f..fd3197410b 100644
--- a/libraries/gl/CMakeLists.txt
+++ b/libraries/gl/CMakeLists.txt
@@ -1,6 +1,5 @@
 set(TARGET_NAME gl)
 setup_hifi_library(OpenGL Qml Quick)
-setup_memory_debugger()
 link_hifi_libraries(shared networking)
 
 target_opengl()
diff --git a/tests/entities/CMakeLists.txt b/tests/entities/CMakeLists.txt
index 448ea83956..080ae7cdd9 100644
--- a/tests/entities/CMakeLists.txt
+++ b/tests/entities/CMakeLists.txt
@@ -3,7 +3,7 @@ set(TARGET_NAME "entities-test")
 
 # This is not a testcase -- just set it up as a regular hifi project
 setup_hifi_project(Network Script)
-
+setup_memory_debugger()
 set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "Tests/manual-tests/")
 
 # link in the shared libraries
diff --git a/tools/ice-client/CMakeLists.txt b/tools/ice-client/CMakeLists.txt
index a80145974c..ae42d79f7e 100644
--- a/tools/ice-client/CMakeLists.txt
+++ b/tools/ice-client/CMakeLists.txt
@@ -1,3 +1,4 @@
 set(TARGET_NAME ice-client)
 setup_hifi_project(Core Widgets)
+setup_memory_debugger()
 link_hifi_libraries(shared networking)

From 5af07dfb627e5803bf36e295020c7f9bd6120843 Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Fri, 23 Jun 2017 08:16:48 -0700
Subject: [PATCH 4/4] more memory-debugger

---
 interface/CMakeLists.txt                 | 4 ++--
 tests/gpu-test/CMakeLists.txt            | 1 +
 tests/render-perf/CMakeLists.txt         | 2 ++
 tests/render-texture-load/CMakeLists.txt | 2 ++
 tests/render-utils/CMakeLists.txt        | 2 ++
 tests/shaders/CMakeLists.txt             | 2 ++
 6 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt
index fe42b1432b..dcb1cacef9 100644
--- a/interface/CMakeLists.txt
+++ b/interface/CMakeLists.txt
@@ -4,6 +4,8 @@ project(${TARGET_NAME})
 # set a default root dir for each of our optional externals if it was not passed
 set(OPTIONAL_EXTERNALS "LeapMotion")
 
+setup_memory_debugger()
+
 foreach(EXTERNAL ${OPTIONAL_EXTERNALS})
   string(TOUPPER ${EXTERNAL} ${EXTERNAL}_UPPERCASE)
   if (NOT ${${EXTERNAL}_UPPERCASE}_ROOT_DIR)
@@ -356,8 +358,6 @@ if (ANDROID)
   qt_create_apk()
 endif ()
 
-setup_memory_debugger()
-
 add_dependency_external_projects(GifCreator)
 find_package(GifCreator REQUIRED)
 target_include_directories(${TARGET_NAME} PUBLIC ${GIFCREATOR_INCLUDE_DIRS})
diff --git a/tests/gpu-test/CMakeLists.txt b/tests/gpu-test/CMakeLists.txt
index c37e36b53b..d73d7a111d 100644
--- a/tests/gpu-test/CMakeLists.txt
+++ b/tests/gpu-test/CMakeLists.txt
@@ -2,6 +2,7 @@ set(TARGET_NAME gpu-test)
 AUTOSCRIBE_SHADER_LIB(gpu model render-utils)
 # This is not a testcase -- just set it up as a regular hifi project
 setup_hifi_project(Quick Gui OpenGL Script Widgets)
+setup_memory_debugger()
 set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "Tests/manual-tests/")
 link_hifi_libraries(networking gl gpu gpu-gl procedural shared fbx model model-networking animation script-engine render render-utils octree image ktx)
 package_libraries_for_deployment()
diff --git a/tests/render-perf/CMakeLists.txt b/tests/render-perf/CMakeLists.txt
index a8e4ab286c..b6989a57b7 100644
--- a/tests/render-perf/CMakeLists.txt
+++ b/tests/render-perf/CMakeLists.txt
@@ -5,6 +5,8 @@ if (WIN32)
   SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /ignore:4049 /ignore:4217")
 endif()
 
+setup_memory_debugger()
+
 # This is not a testcase -- just set it up as a regular hifi project
 setup_hifi_project(Quick Gui OpenGL)
 set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "Tests/manual-tests/")
diff --git a/tests/render-texture-load/CMakeLists.txt b/tests/render-texture-load/CMakeLists.txt
index 1f0c0a069a..30030914ab 100644
--- a/tests/render-texture-load/CMakeLists.txt
+++ b/tests/render-texture-load/CMakeLists.txt
@@ -5,6 +5,8 @@ if (WIN32)
   SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /ignore:4049 /ignore:4217")
 endif()
 
+setup_memory_debugger()
+
 # This is not a testcase -- just set it up as a regular hifi project
 setup_hifi_project(Quick Gui OpenGL)
 set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "Tests/manual-tests/")
diff --git a/tests/render-utils/CMakeLists.txt b/tests/render-utils/CMakeLists.txt
index 5ec6a28b5c..4944ad2cbc 100644
--- a/tests/render-utils/CMakeLists.txt
+++ b/tests/render-utils/CMakeLists.txt
@@ -5,6 +5,8 @@ set(TARGET_NAME render-utils-test)
 setup_hifi_project(Quick Gui OpenGL)
 set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "Tests/manual-tests/")
 
+setup_memory_debugger()
+
 # link in the shared libraries
 link_hifi_libraries(render-utils gl gpu gpu-gl shared)
 target_link_libraries(${TARGET_NAME} ${CMAKE_THREAD_LIBS_INIT})
diff --git a/tests/shaders/CMakeLists.txt b/tests/shaders/CMakeLists.txt
index 5b38f473e8..bab1e0dcdc 100644
--- a/tests/shaders/CMakeLists.txt
+++ b/tests/shaders/CMakeLists.txt
@@ -5,6 +5,8 @@ set(TARGET_NAME shaders-test)
 setup_hifi_project(Quick Gui OpenGL)
 set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "Tests/manual-tests/")
 
+setup_memory_debugger()
+
 # link in the shared libraries
 link_hifi_libraries(shared octree gl gpu gpu-gl model render fbx networking entities 
                     script-engine physics