mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-06 03:29:44 -06:00
Code Issues Packages Projects Releases Wiki Activity

Correctly copy libraries

Browse Source 
Combine SyncWidget and openspace::DownloadManager
This commit is contained in:
Alexander Bock
2015-06-10 02:37:37 +02:00
parent f1791d9816
commit bf58c8ab75
7 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
support/cmake/support_macros.cmake
View File

@@ -166,10 +166,10 @@ function (add_external_dependencies)
# Curl
if (WIN32)
set(CURL_ROOT_DIR "${OPENSPACE_EXT_DIR}/curl")
set(CURL_ROOT_DIR "${OPENSPACE_EXT_DIR}/curl" PARENT_SCOPE)
target_include_directories(libOpenSpace SYSTEM PUBLIC ${CURL_ROOT_DIR}/include)
target_link_libraries(libOpenSpace ${CURL_ROOT_DIR}/lib/libcurl_imp.lib)
target_compile_definitions(libOpenSpace PUBLIC "OPENSPACE_CURL_ENABLED" "CURL_STATICLIB")
copy_files(OpenSpace "${CURL_ROOT_DIR}/lib/libcurl.dll")
else ()
find_package(curl)
if (CURL_FOUND)
@@ -437,6 +437,9 @@ endfunction ()
function (copy_dynamic_libraries)
if (WIN32)
copy_files(OpenSpace "${CURL_ROOT_DIR}/lib/libcurl.dll")
# Copy DLLs needed by Ghoul into the executable directory
ghl_copy_shared_libraries(OpenSpace ${OPENSPACE_EXT_DIR}/ghoul)