From d1f4d110fb5c2ed09ef0111ecd3789f52be1200c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Bylica?= Date: Fri, 18 Aug 2017 13:31:31 +0200 Subject: CMake: Build static libs by default --- libevmasm/CMakeLists.txt | 2 -- 1 file changed, 2 deletions(-) (limited to 'libevmasm/CMakeLists.txt') diff --git a/libevmasm/CMakeLists.txt b/libevmasm/CMakeLists.txt index 9cc3e93e..9c7efb86 100644 --- a/libevmasm/CMakeLists.txt +++ b/libevmasm/CMakeLists.txt @@ -1,5 +1,3 @@ -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSTATICLIB") - aux_source_directory(. SRC_LIST) set(EXECUTABLE solevmasm) -- cgit v1.2.3 From 63372e4a8567b26ad2cc419c6aa22919c5fcb28f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Bylica?= Date: Wed, 16 Aug 2017 13:29:46 +0200 Subject: CMake: Simplify libevmasm config --- libevmasm/CMakeLists.txt | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) (limited to 'libevmasm/CMakeLists.txt') 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 ..) -- cgit v1.2.3 From 388fc983fa5480ec8498c399cf598991c63cfa22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Bylica?= Date: Tue, 22 Aug 2017 16:43:30 +0200 Subject: CMake: Cleanup "local" include path --- libevmasm/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) (limited to 'libevmasm/CMakeLists.txt') diff --git a/libevmasm/CMakeLists.txt b/libevmasm/CMakeLists.txt index 914339e7..5c945c7d 100644 --- a/libevmasm/CMakeLists.txt +++ b/libevmasm/CMakeLists.txt @@ -3,4 +3,3 @@ file(GLOB headers "*.h") add_library(evmasm ${sources} ${headers}) target_link_libraries(evmasm PUBLIC devcore jsoncpp) -target_include_directories(evmasm PUBLIC ..) -- cgit v1.2.3