From 15810eb55fc6b60fc712cfe1c32ec253909b2c65 Mon Sep 17 00:00:00 2001 From: jhuntley Date: Thu, 26 Feb 2015 15:52:02 -0500 Subject: [PATCH] cmake build updates for mingw. Make sure to include boost where referenced and install runtime dlls to bin upon install. --- eth/CMakeLists.txt | 2 +- libnatspec/CMakeLists.txt | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/eth/CMakeLists.txt b/eth/CMakeLists.txt index bc458a50f..68ee8c775 100644 --- a/eth/CMakeLists.txt +++ b/eth/CMakeLists.txt @@ -28,7 +28,7 @@ endif() target_link_libraries(${EXECUTABLE} webthree) target_link_libraries(${EXECUTABLE} secp256k1) -if (WIN32) +if (DEFINED WIN32 AND NOT DEFINED CMAKE_COMPILER_IS_MINGW) add_custom_command(TARGET ${EXECUTABLE} POST_BUILD COMMAND ${CMAKE_COMMAND} ARGS -E copy ${MHD_DLL_RELEASE} "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}") endif() diff --git a/libnatspec/CMakeLists.txt b/libnatspec/CMakeLists.txt index af15d56a9..d8d9d46ec 100644 --- a/libnatspec/CMakeLists.txt +++ b/libnatspec/CMakeLists.txt @@ -14,6 +14,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON) aux_source_directory(. SRC_LIST) include_directories(BEFORE ..) +include_directories(${Boost_INCLUDE_DIRS}) set(EXECUTABLE natspec) @@ -31,5 +32,5 @@ target_link_libraries(${EXECUTABLE} Qt5::Core) target_link_libraries(${EXECUTABLE} Qt5::Qml) target_link_libraries(${EXECUTABLE} devcore) -install( TARGETS ${EXECUTABLE} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib ) +install( TARGETS ${EXECUTABLE} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib LIBRARY DESTINATION lib ) install( FILES ${HEADERS} DESTINATION include/${EXECUTABLE} )