From 6c07a4c380270db346308e0cb4c058a939613762 Mon Sep 17 00:00:00 2001 From: Christian Date: Sat, 25 Oct 2014 17:56:44 +0200 Subject: [PATCH 1/2] CMakeLists library dependency cleanup for libdevcore, libevmface, libsolidity and solc. Fixes #417. --- CMakeLists.txt | 27 +-------------------------- 1 file changed, 1 insertion(+), 26 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 59aa78364..757d0cc06 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,33 +16,8 @@ file(GLOB HEADERS "*.h") include_directories(..) -target_link_libraries(${EXECUTABLE} evmface) target_link_libraries(${EXECUTABLE} devcore) - - -if("${TARGET_PLATFORM}" STREQUAL "w64") - target_link_libraries(${EXECUTABLE} boost_system-mt-s) - target_link_libraries(${EXECUTABLE} boost_thread_win32-mt-s) - target_link_libraries(${EXECUTABLE} iphlpapi) - target_link_libraries(${EXECUTABLE} ws2_32) - target_link_libraries(${EXECUTABLE} mswsock) - target_link_libraries(${EXECUTABLE} shlwapi) -elseif (APPLE) - # Latest mavericks boost libraries only come with -mt - target_link_libraries(${EXECUTABLE} boost_system-mt) - target_link_libraries(${EXECUTABLE} boost_thread-mt) - find_package(Threads REQUIRED) - target_link_libraries(${EXECUTABLE} ${CMAKE_THREAD_LIBS_INIT}) -elseif (UNIX) - target_link_libraries(${EXECUTABLE} ${Boost_SYSTEM_LIBRARY}) - target_link_libraries(${EXECUTABLE} ${Boost_THREAD_LIBRARY}) - target_link_libraries(${EXECUTABLE} ${CMAKE_THREAD_LIBS_INIT}) -else () - target_link_libraries(${EXECUTABLE} boost_system) - target_link_libraries(${EXECUTABLE} boost_thread) - find_package(Threads REQUIRED) - target_link_libraries(${EXECUTABLE} ${CMAKE_THREAD_LIBS_INIT}) -endif () +target_link_libraries(${EXECUTABLE} evmface) install( TARGETS ${EXECUTABLE} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib ) install( FILES ${HEADERS} DESTINATION include/${EXECUTABLE} ) From f24e0594df895b400bc88723aae404d499685e57 Mon Sep 17 00:00:00 2001 From: Gav Wood Date: Sat, 25 Oct 2014 23:56:16 +0200 Subject: [PATCH 2/2] Warnings fixes. --- Types.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Types.cpp b/Types.cpp index 62324f8c2..301e95778 100644 --- a/Types.cpp +++ b/Types.cpp @@ -51,6 +51,7 @@ std::shared_ptr Type::fromElementaryTypeName(Token::Value _typeToken) return std::make_shared(); else BOOST_ASSERT(false); // @todo add other tyes + return std::shared_ptr(); } std::shared_ptr Type::fromUserDefinedTypeName(UserDefinedTypeName const& _typeName)