mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-07 12:10:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

[Cmake] Rename use renamed ghl_copy_files macro

Browse Source
This commit is contained in:
Klas Eskilson
2017-06-02 09:46:11 -04:00
parent b3cb3794ef
commit 3b2ca27562
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/OpenSpace/CMakeLists.txt
View File

@@ -96,7 +96,7 @@ add_executable(${APPLICATION_NAME}
${RESOURCE_FILE}
)
if (OPENSPACE_SPOUT_SUPPORT)
copy_files(
ghl_copy_files(
${APPLICATION_NAME}
${OPENSPACE_APPS_DIR}/OpenSpace/ext/spout/SpoutLibrary.dll
)

8
support/cmake/support_macros.cmake
View File

@@ -247,7 +247,7 @@ function (handle_applications)
if (WIN32)
copy_files(
ghl_copy_files(
${APPLICATION_NAME}
"${CURL_ROOT_DIR}/lib/libcurl.dll"
"${CURL_ROOT_DIR}/lib/libeay32.dll"
@@ -293,7 +293,7 @@ function (handle_option_vld)
target_include_directories(libOpenSpace PUBLIC ${OPENSPACE_EXT_DIR}/vld)
foreach (app ${OPENSPACE_APPLCATIONS})
copy_files(${app} "${OPENSPACE_EXT_DIR}/vld/bin/vld_x64.dll")
ghl_copy_files(${app} "${OPENSPACE_EXT_DIR}/vld/bin/vld_x64.dll")
endforeach ()
endif ()
endfunction ()
@@ -503,7 +503,7 @@ function (handle_internal_modules)
if (WIN32)
foreach (application ${OPENSPACE_APPLICATIONS})
foreach (dll ${dll_list})
copy_files(${application} ${dll})
ghl_copy_files(${application} ${dll})
endforeach ()
endforeach ()
endif ()
@@ -511,7 +511,7 @@ endfunction ()
function (copy_dynamic_libraries)
if (WIN32)
copy_files(OpenSpace "${CURL_ROOT_DIR}/lib/libcurl.dll")
ghl_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)