Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-14 17:06:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

add memory-debugging macro to some cmake files

Browse source
This commit is contained in:
Seth Alves 2017-06-22 10:07:39 -07:00
parent d2a8300a3f
commit 7ff576ef18
9 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
assignment-client/CMakeLists.txt
View file

@ -7,6 +7,8 @@ if (APPLE)
set_target_properties(${TARGET_NAME} PROPERTIES INSTALL_RPATH "@executable_path/../Frameworks") set_target_properties(${TARGET_NAME} PROPERTIES INSTALL_RPATH "@executable_path/../Frameworks")
endif () endif ()
setup_memory_debugger()
# link in the shared libraries # link in the shared libraries
link_hifi_libraries( link_hifi_libraries(
audio avatars octree gpu model fbx entities audio avatars octree gpu model fbx entities

2
domain-server/CMakeLists.txt
View file

@ -14,6 +14,8 @@ if (APPLE)
set_target_properties(${TARGET_NAME} PROPERTIES INSTALL_RPATH "@executable_path/../Frameworks") set_target_properties(${TARGET_NAME} PROPERTIES INSTALL_RPATH "@executable_path/../Frameworks")
endif () endif ()
setup_memory_debugger()
# TODO: find a solution that will handle web file changes in resources on windows without a re-build. # 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 # 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. # not be re-copied. This is worked-around on OS X/UNIX by using a symlink.

2
ice-server/CMakeLists.txt
View file

@ -18,5 +18,7 @@ endif ()
include_directories(SYSTEM "${OPENSSL_INCLUDE_DIR}") include_directories(SYSTEM "${OPENSSL_INCLUDE_DIR}")
setup_memory_debugger()
# append OpenSSL to our list of libraries to link # append OpenSSL to our list of libraries to link
target_link_libraries(${TARGET_NAME} ${OPENSSL_LIBRARIES}) target_link_libraries(${TARGET_NAME} ${OPENSSL_LIBRARIES})

2
interface/CMakeLists.txt
View file

@ -356,6 +356,8 @@ if (ANDROID)
qt_create_apk() qt_create_apk()
endif () endif ()
setup_memory_debugger()
add_dependency_external_projects(GifCreator) add_dependency_external_projects(GifCreator)
find_package(GifCreator REQUIRED) find_package(GifCreator REQUIRED)
target_include_directories(${TARGET_NAME} PUBLIC ${GIFCREATOR_INCLUDE_DIRS}) target_include_directories(${TARGET_NAME} PUBLIC ${GIFCREATOR_INCLUDE_DIRS})

1
libraries/gl/CMakeLists.txt
View file

@ -1,5 +1,6 @@
set(TARGET_NAME gl) set(TARGET_NAME gl)
setup_hifi_library(OpenGL Qml Quick) setup_hifi_library(OpenGL Qml Quick)
setup_memory_debugger()
link_hifi_libraries(shared networking) link_hifi_libraries(shared networking)
target_opengl() target_opengl()

4
tests/controllers/CMakeLists.txt
View file

@ -5,6 +5,8 @@ set(TARGET_NAME controllers-test)
setup_hifi_project(Script Qml) setup_hifi_project(Script Qml)
set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "Tests/manual-tests/") set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "Tests/manual-tests/")
setup_memory_debugger()
# link in the shared libraries # link in the shared libraries
link_hifi_libraries(shared gl script-engine plugins render-utils ui-plugins input-plugins display-plugins controllers) 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}) target_link_libraries(${TARGET_NAME} ${OPENVR_LIBRARIES})
endif() endif()
package_libraries_for_deployment() package_libraries_for_deployment()

4
tests/qt59/CMakeLists.txt
View file

@ -1,10 +1,12 @@
set(TARGET_NAME qt59) set(TARGET_NAME qt59)
if (WIN32) if (WIN32)
SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /ignore:4049 /ignore:4217") SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /ignore:4049 /ignore:4217")
endif() endif()
setup_memory_debugger()
# This is not a testcase -- just set it up as a regular hifi project # This is not a testcase -- just set it up as a regular hifi project
setup_hifi_project(Gui) setup_hifi_project(Gui)
set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "Tests/manual-tests/") set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "Tests/manual-tests/")

1
tests/recording/CMakeLists.txt
View file

@ -2,6 +2,7 @@ set(TARGET_NAME recording-test)
# This is not a testcase -- just set it up as a regular hifi project # This is not a testcase -- just set it up as a regular hifi project
setup_hifi_project(Test) setup_hifi_project(Test)
set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "Tests/manual-tests/") set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "Tests/manual-tests/")
setup_memory_debugger()
link_hifi_libraries(shared recording) link_hifi_libraries(shared recording)
package_libraries_for_deployment() package_libraries_for_deployment()

2
tools/vhacd-util/CMakeLists.txt
View file

@ -8,6 +8,8 @@ find_package(VHACD REQUIRED)
target_include_directories(${TARGET_NAME} PUBLIC ${VHACD_INCLUDE_DIRS}) target_include_directories(${TARGET_NAME} PUBLIC ${VHACD_INCLUDE_DIRS})
target_link_libraries(${TARGET_NAME} ${VHACD_LIBRARIES}) target_link_libraries(${TARGET_NAME} ${VHACD_LIBRARIES})
setup_memory_debugger()
if (UNIX AND NOT APPLE) if (UNIX AND NOT APPLE)
include(FindOpenMP) include(FindOpenMP)
if(OPENMP_FOUND) if(OPENMP_FOUND)