diff --git a/cmake/EthCompilerSettings.cmake b/cmake/EthCompilerSettings.cmake index 60ea3c90f..69a420333 100644 --- a/cmake/EthCompilerSettings.cmake +++ b/cmake/EthCompilerSettings.cmake @@ -12,7 +12,7 @@ if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU") elseif ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") set(CMAKE_CXX_FLAGS "-std=c++11 -Wall -Wno-unknown-pragmas -Wextra -DSHAREDLIB") elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") - set(CMAKE_CXX_FLAGS "") + set(CMAKE_CXX_FLAGS "/EHsc") set(ETH_STATIC 1) else () message(FATAL_ERROR "Your C++ compiler does not support C++11. You have ${CMAKE_CXX_COMPILER_ID}") diff --git a/cmake/EthDependencies.cmake b/cmake/EthDependencies.cmake index 223c14ce3..743968dcb 100644 --- a/cmake/EthDependencies.cmake +++ b/cmake/EthDependencies.cmake @@ -51,7 +51,7 @@ set(Boost_USE_STATIC_LIBS ON) set(Boost_USE_MULTITHREADED ON) set(Boost_COMPILER -vc120) -find_package(Boost 1.55.0 REQUIRED COMPONENTS thread date_time system regex) +find_package(Boost 1.55.0 REQUIRED COMPONENTS thread date_time system regex chrono) if (Boost_FOUND) message(" - boost header: ${Boost_INCLUDE_DIRS}") diff --git a/extdep/compile/boost.cmake b/extdep/compile/boost.cmake index aaf892cc9..c87c907b7 100644 --- a/extdep/compile/boost.cmake +++ b/extdep/compile/boost.cmake @@ -5,7 +5,7 @@ set(boost_address_model) # on windows 64: # set(boost_address_model address-model=64) -set(boost_targets --with-filesystem --with-system --with-thread --with-date_time --with-regex --with-test) +set(boost_targets --with-filesystem --with-system --with-thread --with-date_time --with-regex --with-test --with-chrono) ExternalProject_Add(boost URL http://downloads.sourceforge.net/project/boost/boost/1.55.0/boost_1_55_0.tar.gz BINARY_DIR boost-prefix/src/boost diff --git a/libdevcore/CMakeLists.txt b/libdevcore/CMakeLists.txt index 3d103160c..37e6f4c89 100644 --- a/libdevcore/CMakeLists.txt +++ b/libdevcore/CMakeLists.txt @@ -5,7 +5,6 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSTATICLIB") aux_source_directory(. SRC_LIST) -include_directories(${LEVELDB_INCLUDE_DIR}) include_directories(${Boost_INCLUDE_DIRS}) include_directories(..) @@ -19,9 +18,6 @@ else() add_library(${EXECUTABLE} SHARED ${SRC_LIST} ${HEADERS}) endif() -target_link_libraries(${EXECUTABLE} ${Boost_SYSTEM_LIBRARY}) -target_link_libraries(${EXECUTABLE} ${Boost_THREAD_LIBRARY}) - if (APPLE) find_package(Threads REQUIRED) target_link_libraries(${EXECUTABLE} ${CMAKE_THREAD_LIBS_INIT}) diff --git a/solc/CMakeLists.txt b/solc/CMakeLists.txt index 203a616b4..303318502 100644 --- a/solc/CMakeLists.txt +++ b/solc/CMakeLists.txt @@ -11,6 +11,10 @@ set(EXECUTABLE solc) file(GLOB HEADERS "*.h") add_executable(${EXECUTABLE} ${SRC_LIST} ${HEADERS}) +target_link_libraries(${EXECUTABLE} ${Boost_THREAD_LIBRARY_RELEASE}) +target_link_libraries(${EXECUTABLE} ${Boost_DATE_TIME_LIBRARY_RELEASE}) +target_link_libraries(${EXECUTABLE} ${Boost_SYSTEM_LIBRARY_RELEASE}) +target_link_libraries(${EXECUTABLE} ${Boost_CHRONO_LIBRARY_RELEASE}) target_link_libraries(${EXECUTABLE} solidity) install( TARGETS ${EXECUTABLE} DESTINATION bin )