mirror of
https://github.com/HifiExperiments/overte.git
synced 2025-07-10 19:07:23 +02:00
checkpoint
This commit is contained in:
parent
e17d0b2af3
commit
9ad865c7f0
17 changed files with 18 additions and 20 deletions
|
@ -5,5 +5,4 @@ setup_hifi_project(Network)
|
||||||
|
|
||||||
# link the shared hifi libraries
|
# link the shared hifi libraries
|
||||||
link_hifi_libraries(embedded-webserver networking shared)
|
link_hifi_libraries(embedded-webserver networking shared)
|
||||||
|
package_libraries_for_deployment()
|
||||||
copy_dlls_beside_windows_executable()
|
|
||||||
|
|
|
@ -3,7 +3,7 @@ macro (setup_testcase_dependencies)
|
||||||
# link in the shared libraries
|
# link in the shared libraries
|
||||||
link_hifi_libraries(shared animation gpu fbx model networking)
|
link_hifi_libraries(shared animation gpu fbx model networking)
|
||||||
|
|
||||||
copy_dlls_beside_windows_executable()
|
package_libraries_for_deployment()
|
||||||
endmacro ()
|
endmacro ()
|
||||||
|
|
||||||
setup_hifi_testcase()
|
setup_hifi_testcase()
|
||||||
|
|
|
@ -3,7 +3,7 @@ macro (SETUP_TESTCASE_DEPENDENCIES)
|
||||||
# link in the shared libraries
|
# link in the shared libraries
|
||||||
link_hifi_libraries(shared audio networking)
|
link_hifi_libraries(shared audio networking)
|
||||||
|
|
||||||
copy_dlls_beside_windows_executable()
|
package_libraries_for_deployment()
|
||||||
endmacro ()
|
endmacro ()
|
||||||
|
|
||||||
setup_hifi_testcase()
|
setup_hifi_testcase()
|
||||||
|
|
|
@ -16,4 +16,4 @@ if (WIN32)
|
||||||
target_link_libraries(${TARGET_NAME} ${OPENVR_LIBRARIES})
|
target_link_libraries(${TARGET_NAME} ${OPENVR_LIBRARIES})
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
copy_dlls_beside_windows_executable()
|
package_libraries_for_deployment()
|
|
@ -9,4 +9,4 @@ set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "Tests/manual-tests/")
|
||||||
# link in the shared libraries
|
# link in the shared libraries
|
||||||
link_hifi_libraries(entities avatars shared octree gpu model fbx networking animation environment)
|
link_hifi_libraries(entities avatars shared octree gpu model fbx networking animation environment)
|
||||||
|
|
||||||
copy_dlls_beside_windows_executable()
|
package_libraries_for_deployment()
|
||||||
|
|
|
@ -4,4 +4,4 @@ AUTOSCRIBE_SHADER_LIB(gpu model render-utils)
|
||||||
setup_hifi_project(Quick Gui OpenGL Script Widgets)
|
setup_hifi_project(Quick Gui OpenGL Script Widgets)
|
||||||
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 procedural shared fbx model model-networking animation script-engine render-utils )
|
link_hifi_libraries(networking gl gpu procedural shared fbx model model-networking animation script-engine render-utils )
|
||||||
copy_dlls_beside_windows_executable()
|
package_libraries_for_deployment()
|
|
@ -4,7 +4,7 @@ macro (setup_testcase_dependencies)
|
||||||
# link in the shared libraries
|
# link in the shared libraries
|
||||||
link_hifi_libraries(shared networking)
|
link_hifi_libraries(shared networking)
|
||||||
|
|
||||||
copy_dlls_beside_windows_executable()
|
package_libraries_for_deployment()
|
||||||
endmacro()
|
endmacro()
|
||||||
|
|
||||||
setup_hifi_testcase()
|
setup_hifi_testcase()
|
||||||
|
|
|
@ -4,7 +4,7 @@ macro (setup_testcase_dependencies)
|
||||||
# link in the shared libraries
|
# link in the shared libraries
|
||||||
link_hifi_libraries(shared networking)
|
link_hifi_libraries(shared networking)
|
||||||
|
|
||||||
copy_dlls_beside_windows_executable()
|
package_libraries_for_deployment()
|
||||||
endmacro ()
|
endmacro ()
|
||||||
|
|
||||||
setup_hifi_testcase()
|
setup_hifi_testcase()
|
||||||
|
|
|
@ -4,7 +4,7 @@ macro (setup_testcase_dependencies)
|
||||||
# link in the shared libraries
|
# link in the shared libraries
|
||||||
link_hifi_libraries(shared octree gpu model fbx networking environment entities avatars audio animation script-engine physics)
|
link_hifi_libraries(shared octree gpu model fbx networking environment entities avatars audio animation script-engine physics)
|
||||||
|
|
||||||
copy_dlls_beside_windows_executable()
|
package_libraries_for_deployment()
|
||||||
endmacro ()
|
endmacro ()
|
||||||
|
|
||||||
setup_hifi_testcase(Script Network)
|
setup_hifi_testcase(Script Network)
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
macro (SETUP_TESTCASE_DEPENDENCIES)
|
macro (SETUP_TESTCASE_DEPENDENCIES)
|
||||||
target_bullet()
|
target_bullet()
|
||||||
link_hifi_libraries(shared physics)
|
link_hifi_libraries(shared physics)
|
||||||
copy_dlls_beside_windows_executable()
|
package_libraries_for_deployment()
|
||||||
endmacro ()
|
endmacro ()
|
||||||
|
|
||||||
setup_hifi_testcase(Script)
|
setup_hifi_testcase(Script)
|
||||||
|
|
|
@ -3,7 +3,7 @@ set(TARGET_NAME recording-test)
|
||||||
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/")
|
||||||
link_hifi_libraries(shared recording)
|
link_hifi_libraries(shared recording)
|
||||||
copy_dlls_beside_windows_executable()
|
package_libraries_for_deployment()
|
||||||
|
|
||||||
# FIXME convert to unit tests
|
# FIXME convert to unit tests
|
||||||
# Declare dependencies
|
# Declare dependencies
|
||||||
|
@ -11,6 +11,6 @@ copy_dlls_beside_windows_executable()
|
||||||
# # link in the shared libraries
|
# # link in the shared libraries
|
||||||
# link_hifi_libraries(shared recording)
|
# link_hifi_libraries(shared recording)
|
||||||
#
|
#
|
||||||
# copy_dlls_beside_windows_executable()
|
# package_libraries_for_deployment()
|
||||||
#endmacro ()
|
#endmacro ()
|
||||||
#setup_hifi_testcase()
|
#setup_hifi_testcase()
|
||||||
|
|
|
@ -8,4 +8,4 @@ set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "Tests/manual-tests/")
|
||||||
# link in the shared libraries
|
# link in the shared libraries
|
||||||
link_hifi_libraries(render-utils gl gpu shared)
|
link_hifi_libraries(render-utils gl gpu shared)
|
||||||
|
|
||||||
copy_dlls_beside_windows_executable()
|
package_libraries_for_deployment()
|
||||||
|
|
|
@ -17,4 +17,4 @@ include_directories("${PROJECT_BINARY_DIR}/../../libraries/render-utils/")
|
||||||
include_directories("${PROJECT_BINARY_DIR}/../../libraries/entities-renderer/")
|
include_directories("${PROJECT_BINARY_DIR}/../../libraries/entities-renderer/")
|
||||||
include_directories("${PROJECT_BINARY_DIR}/../../libraries/model/")
|
include_directories("${PROJECT_BINARY_DIR}/../../libraries/model/")
|
||||||
|
|
||||||
copy_dlls_beside_windows_executable()
|
package_libraries_for_deployment()
|
||||||
|
|
|
@ -5,7 +5,7 @@ macro (setup_testcase_dependencies)
|
||||||
# link in the shared libraries
|
# link in the shared libraries
|
||||||
link_hifi_libraries(shared)
|
link_hifi_libraries(shared)
|
||||||
|
|
||||||
copy_dlls_beside_windows_executable()
|
package_libraries_for_deployment()
|
||||||
endmacro ()
|
endmacro ()
|
||||||
|
|
||||||
setup_hifi_testcase()
|
setup_hifi_testcase()
|
||||||
|
|
|
@ -13,4 +13,4 @@ endif()
|
||||||
# link in the shared libraries
|
# link in the shared libraries
|
||||||
link_hifi_libraries(shared networking gl gpu ui)
|
link_hifi_libraries(shared networking gl gpu ui)
|
||||||
|
|
||||||
copy_dlls_beside_windows_executable()
|
package_libraries_for_deployment()
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
set(TARGET_NAME mtc)
|
set(TARGET_NAME mtc)
|
||||||
setup_hifi_project()
|
setup_hifi_project()
|
||||||
|
|
||||||
copy_dlls_beside_windows_executable()
|
package_libraries_for_deployment()
|
||||||
|
|
|
@ -2,5 +2,4 @@ set(TARGET_NAME udt-test)
|
||||||
setup_hifi_project()
|
setup_hifi_project()
|
||||||
|
|
||||||
link_hifi_libraries(networking shared)
|
link_hifi_libraries(networking shared)
|
||||||
|
package_libraries_for_deployment()
|
||||||
copy_dlls_beside_windows_executable()
|
|
Loading…
Reference in a new issue