From 88393195b4d9835e7b35d0705c072a2686fef07d Mon Sep 17 00:00:00 2001 From: ethdev Date: Thu, 11 Dec 2014 22:26:20 +0100 Subject: [PATCH] fixed copying dlls on windows --- cmake/EthExecutableHelper.cmake | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/cmake/EthExecutableHelper.cmake b/cmake/EthExecutableHelper.cmake index d63dd930e..6c7ea4f50 100644 --- a/cmake/EthExecutableHelper.cmake +++ b/cmake/EthExecutableHelper.cmake @@ -92,11 +92,11 @@ macro(eth_install_executable EXECUTABLE) elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") # copy all dlls to executable directory - file (GLOB DLLS ${CMAKE_DEPENDENCY_INSTALL_DIR}/bin/*.dll) + file (GLOB DLLS ${ETH_DEPENDENCY_INSTALL_DIR}/bin/*.dll) foreach(DLL ${DLLS}) add_custom_command(TARGET ${EXECUTABLE} POST_BUILD - COMMAND cmake -E copy ${DLL} $ + COMMAND cmake -E copy "${DLL}" "$" ) endforeach() @@ -105,8 +105,9 @@ macro(eth_install_executable EXECUTABLE) "${ETH_DEPENDENCY_INSTALL_DIR}/plugins/platforms" $/platforms ) - + install( TARGETS ${EXECUTABLE} RUNTIME DESTINATION bin) + else() install( TARGETS ${EXECUTABLE} RUNTIME DESTINATION bin) endif ()