Merge pull request #5661 from sethalves/linux-memory-debugger

call setup_memory_debugger from common macros rather than from everywhere

assignment-client/CMakeLists.txt

@@ -19,6 +19,4 @@ endif (UNIX)
 
 include_application_version()
 
-setup_memory_debugger()
-
 copy_dlls_beside_windows_executable()

cmake/macros/LinkHifiLibraries.cmake

@@ -33,4 +33,7 @@ macro(LINK_HIFI_LIBRARIES)
       list(APPEND ${TARGET_NAME}_DEPENDENCY_INCLUDES ${LINKED_TARGET_DEPENDENCY_INCLUDES})
     endif()
   endforeach()
+
+  setup_memory_debugger()
+
 endmacro(LINK_HIFI_LIBRARIES)

cmake/macros/SetupHifiLibrary.cmake

@@ -15,6 +15,8 @@ macro(SETUP_HIFI_LIBRARY)
   file(GLOB_RECURSE LIB_SRCS "src/*.h" "src/*.cpp" "src/*.c")
   list(APPEND ${TARGET_NAME}_SRCS ${LIB_SRCS})
 
+  setup_memory_debugger()
+
   # create a library and set the property so it can be referenced later
   if (${${TARGET_NAME}_SHARED})
     add_library(${TARGET_NAME} SHARED ${LIB_SRCS} ${AUTOMTC_SRC} ${AUTOSCRIBE_SHADER_LIB_SRC} ${QT_RESOURCES_FILE})

domain-server/CMakeLists.txt

@@ -1,7 +1,5 @@
 set(TARGET_NAME domain-server)
 
-setup_memory_debugger()
-
 if (UPPER_CMAKE_BUILD_TYPE MATCHES DEBUG AND NOT WIN32)
   set(_SHOULD_SYMLINK_RESOURCES TRUE)
 else ()

gvr-interface/CMakeLists.txt

@@ -88,6 +88,4 @@ if (ANDROID)
   
 endif (ANDROID)
 
-setup_memory_debugger()
-
 copy_dlls_beside_windows_executable()

ice-server/CMakeLists.txt

@@ -1,7 +1,5 @@
 set(TARGET_NAME ice-server)
 
-setup_memory_debugger()
-
 # setup the project and link required Qt modules
 setup_hifi_project(Network)
 

interface/CMakeLists.txt

@@ -205,6 +205,4 @@ else (APPLE)
   endif()
 endif (APPLE)
 
-setup_memory_debugger()
-
 copy_dlls_beside_windows_executable()

libraries/animation/CMakeLists.txt

@@ -3,6 +3,4 @@ set(TARGET_NAME animation)
 # use setup_hifi_library macro to setup our project and link appropriate Qt modules
 setup_hifi_library(Network Script)
 
-setup_memory_debugger()
-
 link_hifi_libraries(shared gpu model fbx)

libraries/audio-client/CMakeLists.txt

@@ -1,7 +1,5 @@
 set(TARGET_NAME audio-client)
 
-setup_memory_debugger()
-
 # use setup_hifi_library macro to setup our project and link appropriate Qt modules
 setup_hifi_library(Network Multimedia)
 

libraries/audio/CMakeLists.txt

@@ -1,7 +1,5 @@
 set(TARGET_NAME audio)
 
-setup_memory_debugger()
-
 # use setup_hifi_library macro to setup our project and link appropriate Qt modules
 setup_hifi_library(Network)
 

libraries/auto-updater/CMakeLists.txt

@@ -1,6 +1,4 @@
 set(TARGET_NAME auto-updater)
 
-setup_memory_debugger()
-
 setup_hifi_library(Network)
 link_hifi_libraries(shared networking)

libraries/avatars/CMakeLists.txt

@@ -1,7 +1,5 @@
 set(TARGET_NAME avatars)
 
-setup_memory_debugger()
-
 # use setup_hifi_library macro to setup our project and link appropriate Qt modules
 setup_hifi_library(Network Script)
 

libraries/display-plugins/CMakeLists.txt

@@ -1,7 +1,5 @@
 set(TARGET_NAME display-plugins)
 
-setup_memory_debugger()
-
 # use setup_hifi_library macro to setup our project and link appropriate Qt modules
 setup_hifi_library(OpenGL)
 

libraries/embedded-webserver/CMakeLists.txt

@@ -1,6 +1,4 @@
 set(TARGET_NAME embedded-webserver)
 
-setup_memory_debugger()
-
 # use setup_hifi_library macro to setup our project and link appropriate Qt modules
 setup_hifi_library(Network)

libraries/entities-renderer/CMakeLists.txt

@@ -26,6 +26,4 @@ find_package(PolyVox REQUIRED)
 target_include_directories(${TARGET_NAME} SYSTEM PUBLIC ${POLYVOX_INCLUDE_DIRS})
 target_link_libraries(${TARGET_NAME} ${POLYVOX_LIBRARIES})
 
-setup_memory_debugger()
-
 link_hifi_libraries(shared gpu script-engine render render-utils)

libraries/entities/CMakeLists.txt

@@ -1,7 +1,5 @@
 set(TARGET_NAME entities)
 
-setup_memory_debugger()
-
 # use setup_hifi_library macro to setup our project and link appropriate Qt modules
 setup_hifi_library(Network Script)
 

libraries/environment/CMakeLists.txt

@@ -7,6 +7,4 @@ add_dependency_external_projects(glm)
 find_package(GLM REQUIRED)
 target_include_directories(${TARGET_NAME} PUBLIC ${GLM_INCLUDE_DIRS})
 
-setup_memory_debugger()
-
 link_hifi_libraries(shared networking)

libraries/fbx/CMakeLists.txt

@@ -7,6 +7,4 @@ add_dependency_external_projects(glm)
 find_package(GLM REQUIRED)
 target_include_directories(${TARGET_NAME} PUBLIC ${GLM_INCLUDE_DIRS})
 
-setup_memory_debugger()
-
 link_hifi_libraries(shared gpu model networking octree)

libraries/gpu/CMakeLists.txt

@@ -1,7 +1,5 @@
 set(TARGET_NAME gpu)
 
-setup_memory_debugger()
-
 AUTOSCRIBE_SHADER_LIB(gpu)
 
 # use setup_hifi_library macro to setup our project and link appropriate Qt modules

libraries/input-plugins/CMakeLists.txt

@@ -33,8 +33,6 @@ endif()
 #target_include_directories(${TARGET_NAME} PRIVATE ${SIXENSE_INCLUDE_DIRS})
 #target_link_libraries(${TARGET_NAME} ${SIXENSE_LIBRARIES})
 
-setup_memory_debugger()
-
 # perform standard include and linking for found externals
 foreach(EXTERNAL ${OPTIONAL_EXTERNALS})
   

libraries/model/CMakeLists.txt

@@ -2,8 +2,6 @@ set(TARGET_NAME model)
 
 AUTOSCRIBE_SHADER_LIB(gpu model)
 
-setup_memory_debugger()
-
 # use setup_hifi_library macro to setup our project and link appropriate Qt modules
 setup_hifi_library()
 

libraries/networking/CMakeLists.txt

@@ -1,7 +1,5 @@
 set(TARGET_NAME networking)
 
-setup_memory_debugger()
-
 # use setup_hifi_library macro to setup our project and link appropriate Qt modules
 setup_hifi_library(Network)
 

libraries/octree/CMakeLists.txt

@@ -1,7 +1,5 @@
 set(TARGET_NAME octree)
 
-setup_memory_debugger()
-
 # use setup_hifi_library macro to setup our project and link appropriate Qt modules
 setup_hifi_library()
 

libraries/physics/CMakeLists.txt

@@ -1,7 +1,5 @@
 set(TARGET_NAME physics)
 
-setup_memory_debugger()
-
 # use setup_hifi_library macro to setup our project and link appropriate Qt modules
 setup_hifi_library()
 

libraries/plugins/CMakeLists.txt

@@ -8,6 +8,4 @@ link_hifi_libraries(shared)
 add_dependency_external_projects(glm)
 find_package(GLM REQUIRED)
 
-setup_memory_debugger()
-
 target_include_directories(${TARGET_NAME} PUBLIC ${GLM_INCLUDE_DIRS})

libraries/render-utils/CMakeLists.txt

@@ -40,6 +40,4 @@ add_dependency_external_projects(oglplus)
 find_package(OGLPLUS REQUIRED)
 target_include_directories(${TARGET_NAME} PUBLIC ${OGLPLUS_INCLUDE_DIRS})
 
-setup_memory_debugger()
-
 link_hifi_libraries(animation fbx shared gpu model render environment)

libraries/render/CMakeLists.txt

@@ -1,7 +1,5 @@
 set(TARGET_NAME render)
 
-setup_memory_debugger()
-
 AUTOSCRIBE_SHADER_LIB(gpu model)
 
 # use setup_hifi_library macro to setup our project and link appropriate Qt modules

libraries/script-engine/CMakeLists.txt

@@ -1,7 +1,5 @@
 set(TARGET_NAME script-engine)
 
-setup_memory_debugger()
-
 # use setup_hifi_library macro to setup our project and link appropriate Qt modules
 setup_hifi_library(Gui Network Script WebSockets Widgets)
 

libraries/shared/CMakeLists.txt

@@ -1,7 +1,5 @@
 set(TARGET_NAME shared)
 
-setup_memory_debugger()
-
 # 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 Script Widgets)

libraries/ui/CMakeLists.txt

@@ -8,6 +8,4 @@ link_hifi_libraries(render-utils shared)
 add_dependency_external_projects(glm)
 find_package(GLM REQUIRED)
 
-setup_memory_debugger()
-
 target_include_directories(${TARGET_NAME} PUBLIC ${GLM_INCLUDE_DIRS})

tests/CMakeLists.txt

@@ -35,5 +35,3 @@ set_target_properties("all-tests" PROPERTIES FOLDER "hidden/test-targets")
 set_target_properties("all-tests" PROPERTIES
     EXCLUDE_FROM_DEFAULT_BUILD TRUE
     EXCLUDE_FROM_ALL TRUE)
-
-setup_memory_debugger()

tests/animation/CMakeLists.txt

@@ -6,6 +6,4 @@ macro (setup_testcase_dependencies)
   copy_dlls_beside_windows_executable()
 endmacro ()
 
-setup_memory_debugger()
-
 setup_hifi_testcase()

tests/audio/CMakeLists.txt

@@ -6,6 +6,4 @@ macro (SETUP_TESTCASE_DEPENDENCIES)
   copy_dlls_beside_windows_executable()
 endmacro ()
 
-setup_memory_debugger()
-
 setup_hifi_testcase()

tests/entities/CMakeLists.txt

@@ -9,6 +9,4 @@ set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "Tests/manual-tests/")
 # link in the shared libraries
 link_hifi_libraries(entities avatars shared octree gpu model fbx networking animation environment)
 
-setup_memory_debugger()
-
 copy_dlls_beside_windows_executable()

tests/jitter/CMakeLists.txt

@@ -7,6 +7,4 @@ macro (setup_testcase_dependencies)
   copy_dlls_beside_windows_executable()
 endmacro()
 
-setup_memory_debugger()
-
 setup_hifi_testcase()

tests/networking/CMakeLists.txt

@@ -7,6 +7,4 @@ macro (setup_testcase_dependencies)
   copy_dlls_beside_windows_executable()
 endmacro ()
 
-setup_memory_debugger()
-
 setup_hifi_testcase()

tests/octree/CMakeLists.txt

@@ -7,6 +7,4 @@ macro (setup_testcase_dependencies)
   copy_dlls_beside_windows_executable()
 endmacro ()
 
-setup_memory_debugger()
-
 setup_hifi_testcase(Script Network)

tests/physics/CMakeLists.txt

@@ -21,6 +21,4 @@ macro (SETUP_TESTCASE_DEPENDENCIES)
   copy_dlls_beside_windows_executable()
 endmacro ()
 
-setup_memory_debugger()
-
 setup_hifi_testcase(Script)

tests/render-utils/CMakeLists.txt

@@ -10,6 +10,4 @@ link_hifi_libraries(render-utils gpu shared)
 
 message(${PROJECT_BINARY_DIR})
 
-setup_memory_debugger()
-
 copy_dlls_beside_windows_executable()

tests/shaders/CMakeLists.txt

@@ -19,6 +19,4 @@ include_directories("${PROJECT_BINARY_DIR}/../../libraries/model/")
 
 message(${PROJECT_BINARY_DIR})
 
-setup_memory_debugger()
-
 copy_dlls_beside_windows_executable()

tests/shared/CMakeLists.txt

@@ -8,6 +8,4 @@ macro (setup_testcase_dependencies)
   copy_dlls_beside_windows_executable()
 endmacro ()
 
-setup_memory_debugger()
-
 setup_hifi_testcase()

tests/ui/CMakeLists.txt

@@ -13,6 +13,4 @@ endif()
 # link in the shared libraries
 link_hifi_libraries(ui render-utils gpu shared)
 
-setup_memory_debugger()
-
 copy_dlls_beside_windows_executable()

tools/CMakeLists.txt

@@ -1,5 +1,3 @@
-setup_memory_debugger()
-
 # add the tool directories
 add_subdirectory(mtc)
 set_target_properties(mtc PROPERTIES FOLDER "Tools")

tools/mtc/CMakeLists.txt

@@ -1,6 +1,4 @@
 set(TARGET_NAME mtc)
 setup_hifi_project()
 
-setup_memory_debugger()
-
 copy_dlls_beside_windows_executable()

tools/scribe/CMakeLists.txt

@@ -1,5 +1,3 @@
 set(TARGET_NAME scribe)
 
-setup_memory_debugger()
-
 setup_hifi_project()

tools/vhacd-util/CMakeLists.txt

@@ -8,8 +8,6 @@ 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)