From 3b2ca2756202aa6d3e9519a67b91ef46ac628b91 Mon Sep 17 00:00:00 2001 From: Klas Eskilson Date: Fri, 2 Jun 2017 09:46:11 -0400 Subject: [PATCH] [Cmake] Rename use renamed ghl_copy_files macro --- apps/OpenSpace/CMakeLists.txt | 2 +- support/cmake/support_macros.cmake | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/OpenSpace/CMakeLists.txt b/apps/OpenSpace/CMakeLists.txt index c5e93b08bb..b4ffa29792 100644 --- a/apps/OpenSpace/CMakeLists.txt +++ b/apps/OpenSpace/CMakeLists.txt @@ -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 ) diff --git a/support/cmake/support_macros.cmake b/support/cmake/support_macros.cmake index 82e00c7651..237e677b61 100644 --- a/support/cmake/support_macros.cmake +++ b/support/cmake/support_macros.cmake @@ -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)