From 226ed7b9dcd4764a32cdc146e69a1156dcd401f6 Mon Sep 17 00:00:00 2001 From: chriseth Date: Sat, 6 Aug 2016 11:14:09 +0200 Subject: Some cleanup regarding libdevcore. Also rename to avoid conflicts. --- libevmasm/Assembly.h | 4 ---- libevmasm/CMakeLists.txt | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) (limited to 'libevmasm') diff --git a/libevmasm/Assembly.h b/libevmasm/Assembly.h index d48fa99c..af28e220 100644 --- a/libevmasm/Assembly.h +++ b/libevmasm/Assembly.h @@ -33,10 +33,6 @@ #include "Exceptions.h" #include -namespace Json -{ -class Value; -} namespace dev { namespace eth diff --git a/libevmasm/CMakeLists.txt b/libevmasm/CMakeLists.txt index 8a283976..56b2faca 100644 --- a/libevmasm/CMakeLists.txt +++ b/libevmasm/CMakeLists.txt @@ -8,7 +8,7 @@ file(GLOB HEADERS "*.h") include_directories(BEFORE ..) add_library(${EXECUTABLE} ${SRC_LIST} ${HEADERS}) -eth_use(${EXECUTABLE} REQUIRED Dev::devcore) +eth_use(${EXECUTABLE} REQUIRED Jsoncpp Dev::devcore) install( TARGETS ${EXECUTABLE} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib LIBRARY DESTINATION lib ) install( FILES ${HEADERS} DESTINATION include/${EXECUTABLE} ) -- cgit v1.2.3 From ccd78d05d6221b5eb47514b30f7e5c5aa7169365 Mon Sep 17 00:00:00 2001 From: chriseth Date: Mon, 8 Aug 2016 12:26:07 +0200 Subject: Correct library usage. --- libevmasm/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libevmasm') diff --git a/libevmasm/CMakeLists.txt b/libevmasm/CMakeLists.txt index 56b2faca..f86da49c 100644 --- a/libevmasm/CMakeLists.txt +++ b/libevmasm/CMakeLists.txt @@ -8,7 +8,7 @@ file(GLOB HEADERS "*.h") include_directories(BEFORE ..) add_library(${EXECUTABLE} ${SRC_LIST} ${HEADERS}) -eth_use(${EXECUTABLE} REQUIRED Jsoncpp Dev::devcore) +eth_use(${EXECUTABLE} REQUIRED Jsoncpp Dev::soldevcore) install( TARGETS ${EXECUTABLE} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib LIBRARY DESTINATION lib ) install( FILES ${HEADERS} DESTINATION include/${EXECUTABLE} ) -- cgit v1.2.3