From 63372e4a8567b26ad2cc419c6aa22919c5fcb28f Mon Sep 17 00:00:00 2001
From: Paweł Bylica <chfast@gmail.com>
Date: Wed, 16 Aug 2017 13:29:46 +0200
Subject: CMake: Simplify libevmasm config

---
 libevmasm/CMakeLists.txt | 16 +++++-----------
 test/CMakeLists.txt      |  2 +-
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/libevmasm/CMakeLists.txt b/libevmasm/CMakeLists.txt
index 9c7efb86..914339e7 100644
--- a/libevmasm/CMakeLists.txt
+++ b/libevmasm/CMakeLists.txt
@@ -1,12 +1,6 @@
-aux_source_directory(. SRC_LIST)
+file(GLOB sources "*.cpp")
+file(GLOB headers "*.h")
 
-set(EXECUTABLE solevmasm)
-
-file(GLOB HEADERS "*.h")
-
-include_directories(BEFORE ..)
-add_library(${EXECUTABLE} ${SRC_LIST} ${HEADERS})
-eth_use(${EXECUTABLE} REQUIRED Dev::soldevcore)
-target_link_libraries(${EXECUTABLE} jsoncpp)
-
-install( TARGETS ${EXECUTABLE} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib LIBRARY DESTINATION lib )
+add_library(evmasm ${sources} ${headers})
+target_link_libraries(evmasm PUBLIC devcore jsoncpp)
+target_include_directories(evmasm PUBLIC ..)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 6b114239..3578f497 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -23,4 +23,4 @@ include_directories(BEFORE ..)
 target_link_libraries(${EXECUTABLE} soljson devcore ${Boost_UNIT_TEST_FRAMEWORK_LIBRARIES})
 
 add_executable(solfuzzer fuzzer.cpp)
-target_link_libraries(solfuzzer soljson ${Boost_PROGRAM_OPTIONS_LIBRARIES})
+target_link_libraries(solfuzzer soljson evmasm ${Boost_PROGRAM_OPTIONS_LIBRARIES})
-- 
cgit