aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordebris <marek.kotewicz@gmail.com>2015-08-27 18:19:33 +0800
committerdebris <marek.kotewicz@gmail.com>2015-08-27 18:19:33 +0800
commitfd23ee97d8ec823d8873c8af7f55ce59f0a62316 (patch)
treed4603fee870c7a8645b390a6c471bb35c578eec7
parent34986ee4fcbea4d4f3609d9227864b640f021ffa (diff)
downloaddexon-solidity-fd23ee97d8ec823d8873c8af7f55ce59f0a62316.tar.gz
dexon-solidity-fd23ee97d8ec823d8873c8af7f55ce59f0a62316.tar.zst
dexon-solidity-fd23ee97d8ec823d8873c8af7f55ce59f0a62316.zip
cmake refactor in progress
-rw-r--r--CMakeLists.txt11
1 files changed, 2 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 986cf814..27e42685 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,21 +5,14 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSTATICLIB")
aux_source_directory(. SRC_LIST)
-include_directories(BEFORE ${JSONCPP_INCLUDE_DIRS})
include_directories(BEFORE ..)
-include_directories(${Boost_INCLUDE_DIRS})
set(EXECUTABLE evmasm)
file(GLOB HEADERS "*.h")
-if (ETH_STATIC)
- add_library(${EXECUTABLE} STATIC ${SRC_LIST} ${HEADERS})
-else()
- add_library(${EXECUTABLE} SHARED ${SRC_LIST} ${HEADERS})
-endif()
-
-target_link_libraries(${EXECUTABLE} evmcore)
+add_library(${EXECUTABLE} ${SRC_LIST} ${HEADERS})
+eth_use(${EXECUTABLE} REQUIRED Eth::evmcore)
install( TARGETS ${EXECUTABLE} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib LIBRARY DESTINATION lib )
install( FILES ${HEADERS} DESTINATION include/${EXECUTABLE} )