Browse Source

cmake install changes

cl-refactor
Paweł Bylica 10 years ago
parent
commit
297dca32b5
  1. 6
      cmake/EthExecutableHelper.cmake
  2. 6
      cmake/scripts/copydlls.cmake
  3. 6
      eth/CMakeLists.txt

6
cmake/EthExecutableHelper.cmake

@ -139,6 +139,12 @@ macro(eth_install_executable EXECUTABLE)
COMPONENT ${EXECUTABLE} COMPONENT ${EXECUTABLE}
) )
install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/"
DESTINATION bin
CONFIGURATIONS RelWithDebInfo
COMPONENT ${EXECUTABLE}
)
else() else()
install( TARGETS ${EXECUTABLE} RUNTIME DESTINATION bin) install( TARGETS ${EXECUTABLE} RUNTIME DESTINATION bin)
endif () endif ()

6
cmake/scripts/copydlls.cmake

@ -8,10 +8,10 @@
# this script is created cause we do not know configuration in multiconfiguration generators at cmake configure phase ;) # this script is created cause we do not know configuration in multiconfiguration generators at cmake configure phase ;)
if ("${CONF}" STREQUAL "Release") if ("${CONF}" STREQUAL "Debug")
set(DLL ${DLL_RELEASE})
else () # Debug
set(DLL ${DLL_DEBUG}) set(DLL ${DLL_DEBUG})
else ()
set(DLL ${DLL_RELEASE})
endif() endif()
execute_process(COMMAND ${CMAKE_COMMAND} -E copy "${DLL}" "${DESTINATION}") execute_process(COMMAND ${CMAKE_COMMAND} -E copy "${DLL}" "${DESTINATION}")

6
eth/CMakeLists.txt

@ -41,9 +41,9 @@ if (JSCONSOLE)
target_link_libraries(${EXECUTABLE} jsconsole) target_link_libraries(${EXECUTABLE} jsconsole)
endif() endif()
if (DEFINED WIN32 AND NOT DEFINED CMAKE_COMPILER_IS_MINGW) #if (DEFINED WIN32 AND NOT DEFINED CMAKE_COMPILER_IS_MINGW)
eth_copy_dlls("${EXECUTABLE}" MHD_DLLS) # eth_copy_dlls("${EXECUTABLE}" MHD_DLLS)
endif() #endif()
if (APPLE) if (APPLE)
install(TARGETS ${EXECUTABLE} DESTINATION bin) install(TARGETS ${EXECUTABLE} DESTINATION bin)

Loading…
Cancel
Save