mirror of
https://github.com/overte-org/overte.git
synced 2025-08-08 11:58:10 +02:00
commit
9c99b9d4c5
18 changed files with 31 additions and 3 deletions
|
@ -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
|
||||||
|
|
|
@ -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.
|
||||||
|
|
|
@ -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})
|
||||||
|
|
|
@ -4,6 +4,8 @@ project(${TARGET_NAME})
|
||||||
# set a default root dir for each of our optional externals if it was not passed
|
# set a default root dir for each of our optional externals if it was not passed
|
||||||
set(OPTIONAL_EXTERNALS "LeapMotion")
|
set(OPTIONAL_EXTERNALS "LeapMotion")
|
||||||
|
|
||||||
|
setup_memory_debugger()
|
||||||
|
|
||||||
foreach(EXTERNAL ${OPTIONAL_EXTERNALS})
|
foreach(EXTERNAL ${OPTIONAL_EXTERNALS})
|
||||||
string(TOUPPER ${EXTERNAL} ${EXTERNAL}_UPPERCASE)
|
string(TOUPPER ${EXTERNAL} ${EXTERNAL}_UPPERCASE)
|
||||||
if (NOT ${${EXTERNAL}_UPPERCASE}_ROOT_DIR)
|
if (NOT ${${EXTERNAL}_UPPERCASE}_ROOT_DIR)
|
||||||
|
|
|
@ -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()
|
||||||
|
|
|
@ -3,7 +3,7 @@ set(TARGET_NAME "entities-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(Network Script)
|
setup_hifi_project(Network Script)
|
||||||
|
setup_memory_debugger()
|
||||||
set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "Tests/manual-tests/")
|
set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "Tests/manual-tests/")
|
||||||
|
|
||||||
# link in the shared libraries
|
# link in the shared libraries
|
||||||
|
|
|
@ -2,6 +2,7 @@ set(TARGET_NAME gpu-test)
|
||||||
AUTOSCRIBE_SHADER_LIB(gpu model render-utils)
|
AUTOSCRIBE_SHADER_LIB(gpu model render-utils)
|
||||||
# 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(Quick Gui OpenGL Script Widgets)
|
setup_hifi_project(Quick Gui OpenGL Script Widgets)
|
||||||
|
setup_memory_debugger()
|
||||||
set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "Tests/manual-tests/")
|
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)
|
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()
|
package_libraries_for_deployment()
|
||||||
|
|
|
@ -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/")
|
||||||
|
|
|
@ -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()
|
||||||
|
|
||||||
|
|
|
@ -5,6 +5,8 @@ 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(Quick Gui OpenGL)
|
setup_hifi_project(Quick Gui OpenGL)
|
||||||
set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "Tests/manual-tests/")
|
set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "Tests/manual-tests/")
|
||||||
|
|
|
@ -5,6 +5,8 @@ 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(Quick Gui OpenGL)
|
setup_hifi_project(Quick Gui OpenGL)
|
||||||
set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "Tests/manual-tests/")
|
set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "Tests/manual-tests/")
|
||||||
|
|
|
@ -5,6 +5,8 @@ set(TARGET_NAME render-utils-test)
|
||||||
setup_hifi_project(Quick Gui OpenGL)
|
setup_hifi_project(Quick Gui OpenGL)
|
||||||
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(render-utils gl gpu gpu-gl shared)
|
link_hifi_libraries(render-utils gl gpu gpu-gl shared)
|
||||||
target_link_libraries(${TARGET_NAME} ${CMAKE_THREAD_LIBS_INIT})
|
target_link_libraries(${TARGET_NAME} ${CMAKE_THREAD_LIBS_INIT})
|
||||||
|
|
|
@ -5,6 +5,8 @@ set(TARGET_NAME shaders-test)
|
||||||
setup_hifi_project(Quick Gui OpenGL)
|
setup_hifi_project(Quick Gui OpenGL)
|
||||||
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 octree gl gpu gpu-gl model render fbx networking entities
|
link_hifi_libraries(shared octree gl gpu gpu-gl model render fbx networking entities
|
||||||
script-engine physics
|
script-engine physics
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
set(TARGET_NAME ac-client)
|
set(TARGET_NAME ac-client)
|
||||||
setup_hifi_project(Core Widgets)
|
setup_hifi_project(Core Widgets)
|
||||||
|
setup_memory_debugger()
|
||||||
link_hifi_libraries(shared networking)
|
link_hifi_libraries(shared networking)
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
set(TARGET_NAME atp-get)
|
set(TARGET_NAME atp-get)
|
||||||
setup_hifi_project(Core Widgets)
|
setup_hifi_project(Core Widgets)
|
||||||
|
setup_memory_debugger()
|
||||||
link_hifi_libraries(shared networking)
|
link_hifi_libraries(shared networking)
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
set(TARGET_NAME ice-client)
|
set(TARGET_NAME ice-client)
|
||||||
setup_hifi_project(Core Widgets)
|
setup_hifi_project(Core Widgets)
|
||||||
|
setup_memory_debugger()
|
||||||
link_hifi_libraries(shared networking)
|
link_hifi_libraries(shared networking)
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
set(TARGET_NAME skeleton-dump)
|
set(TARGET_NAME skeleton-dump)
|
||||||
setup_hifi_project(Core Widgets)
|
setup_hifi_project(Core Widgets)
|
||||||
|
setup_memory_debugger()
|
||||||
link_hifi_libraries(shared fbx model gpu gl animation)
|
link_hifi_libraries(shared fbx model gpu gl animation)
|
||||||
|
|
||||||
|
|
|
@ -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)
|
||||||
|
|
Loading…
Reference in a new issue