mirror of
https://github.com/overte-org/overte.git
synced 2025-08-09 13:28:09 +02:00
call dll copy after project deps are setup
This commit is contained in:
parent
5b563e3bc5
commit
68c19866c4
5 changed files with 11 additions and 5 deletions
|
@ -18,3 +18,5 @@ if (UNIX)
|
||||||
endif (UNIX)
|
endif (UNIX)
|
||||||
|
|
||||||
include_dependency_includes()
|
include_dependency_includes()
|
||||||
|
|
||||||
|
copy_dlls_beside_windows_executable()
|
||||||
|
|
|
@ -34,6 +34,4 @@ macro(SETUP_HIFI_PROJECT)
|
||||||
foreach(QT_MODULE ${${TARGET_NAME}_DEPENDENCY_QT_MODULES})
|
foreach(QT_MODULE ${${TARGET_NAME}_DEPENDENCY_QT_MODULES})
|
||||||
target_link_libraries(${TARGET_NAME} Qt5::${QT_MODULE})
|
target_link_libraries(${TARGET_NAME} Qt5::${QT_MODULE})
|
||||||
endforeach()
|
endforeach()
|
||||||
|
|
||||||
copy_dlls_beside_windows_executable()
|
|
||||||
endmacro()
|
endmacro()
|
|
@ -52,4 +52,6 @@ include_directories(SYSTEM "${OPENSSL_INCLUDE_DIR}")
|
||||||
# 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})
|
||||||
|
|
||||||
include_dependency_includes()
|
include_dependency_includes()
|
||||||
|
|
||||||
|
copy_dlls_beside_windows_executable()
|
|
@ -87,4 +87,6 @@ if (ANDROID)
|
||||||
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/templates/hockeyapp.xml.in" "${ANDROID_APK_BUILD_DIR}/res/values/hockeyapp.xml")
|
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/templates/hockeyapp.xml.in" "${ANDROID_APK_BUILD_DIR}/res/values/hockeyapp.xml")
|
||||||
qt_create_apk()
|
qt_create_apk()
|
||||||
|
|
||||||
endif (ANDROID)
|
endif (ANDROID)
|
||||||
|
|
||||||
|
copy_dlls_beside_windows_executable()
|
|
@ -6,4 +6,6 @@ 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)
|
||||||
|
|
||||||
include_dependency_includes()
|
include_dependency_includes()
|
||||||
|
|
||||||
|
copy_dlls_beside_windows_executable()
|
Loading…
Reference in a new issue