From 1741e89c09fb60fc34928d2359ece19c577da6d7 Mon Sep 17 00:00:00 2001
From: debris <marek.kotewicz@gmail.com>
Date: Thu, 27 Aug 2015 14:28:31 +0200
Subject: [PATCH] client refactor

---
 .gitignore                 | 5 ++++-
 libsolidity/CMakeLists.txt | 5 +----
 solc/CMakeLists.txt        | 7 +------
 test/CMakeLists.txt        | 6 +-----
 4 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/.gitignore b/.gitignore
index 675407ee1..ebd0881e9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,4 +28,7 @@
 *.app
 
 # Build directory
-build/
\ No newline at end of file
+build/
+
+# vim stuff
+*.swp
diff --git a/libsolidity/CMakeLists.txt b/libsolidity/CMakeLists.txt
index fa1fd2339..6e1d70af9 100644
--- a/libsolidity/CMakeLists.txt
+++ b/libsolidity/CMakeLists.txt
@@ -10,12 +10,9 @@ set(EXECUTABLE solidity)
 file(GLOB HEADERS "*.h") 
 
 include_directories(BEFORE ..)
-include_directories(BEFORE ${JSONCPP_INCLUDE_DIRS})
 add_library(${EXECUTABLE} ${SRC_LIST} ${HEADERS})
 
-eth_use(${EXECUTABLE} REQUIRED EthCore)
-
-target_link_libraries(${EXECUTABLE} ${JSONCPP_LIBRARIES})
+eth_use(${EXECUTABLE} REQUIRED Eth::devcore Eth::evmasm)
 
 install( TARGETS ${EXECUTABLE} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib LIBRARY DESTINATION lib )
 install( FILES ${HEADERS} DESTINATION include/${EXECUTABLE} )
diff --git a/solc/CMakeLists.txt b/solc/CMakeLists.txt
index 73dc4b6fb..e9a3446b7 100644
--- a/solc/CMakeLists.txt
+++ b/solc/CMakeLists.txt
@@ -1,21 +1,16 @@
-cmake_policy(SET CMP0015 NEW)
 set(CMAKE_AUTOMOC OFF)
 
 aux_source_directory(. SRC_LIST)
 list(REMOVE_ITEM SRC_LIST "./jsonCompiler.cpp")
 
-include_directories(BEFORE ${JSONCPP_INCLUDE_DIRS})
 include_directories(BEFORE ..)
-include_directories(${Boost_INCLUDE_DIRS})
 
 set(EXECUTABLE solc)
 
 file(GLOB HEADERS "*.h")
 add_executable(${EXECUTABLE} ${SRC_LIST} ${HEADERS})
 
-eth_use(${EXECUTABLE} REQUIRED EthCore)
-
-target_link_libraries(${EXECUTABLE} solidity)
+eth_use(${EXECUTABLE} REQUIRED Solidity)
 target_link_libraries(${EXECUTABLE} ${Boost_PROGRAM_OPTIONS_LIBRARIES})
 
 if (APPLE)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 25120c897..9c6e2944f 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -44,14 +44,10 @@ file(GLOB HEADERS "*.h")
 set(EXECUTABLE soltest)
 add_executable(${EXECUTABLE} ${SRC_LIST} ${HEADERS})
 
-eth_use(${EXECUTABLE} REQUIRED EthCore)
+eth_use(${EXECUTABLE} REQUIRED Solidity Eth::ethereum)
 
 include_directories(BEFORE ..)
-include_directories(BEFORE ${JSONCPP_INCLUDE_DIRS})
 target_link_libraries(${EXECUTABLE} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARIES})
-target_link_libraries(${EXECUTABLE} ${ETH_ETHEREUM_LIBRARY})
-target_link_libraries(${EXECUTABLE} ${ETH_ETHCORE_LIBRARY})
-target_link_libraries(${EXECUTABLE} solidity)
 
 enable_testing()
 set(CTEST_OUTPUT_ON_FAILURE TRUE)