From d1f4d110fb5c2ed09ef0111ecd3789f52be1200c Mon Sep 17 00:00:00 2001 From: Paweł Bylica Date: Fri, 18 Aug 2017 13:31:31 +0200 Subject: CMake: Build static libs by default --- liblll/CMakeLists.txt | 2 -- 1 file changed, 2 deletions(-) (limited to 'liblll') diff --git a/liblll/CMakeLists.txt b/liblll/CMakeLists.txt index db90025a..4246e481 100644 --- a/liblll/CMakeLists.txt +++ b/liblll/CMakeLists.txt @@ -1,8 +1,6 @@ cmake_policy(SET CMP0015 NEW) set(CMAKE_AUTOMOC OFF) -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSTATICLIB") - aux_source_directory(. SRC_LIST) set(EXECUTABLE lll) -- cgit From 7337054d8e4c68bc2c82b7c01b695880a86e902b Mon Sep 17 00:00:00 2001 From: Paweł Bylica Date: Wed, 16 Aug 2017 13:21:18 +0200 Subject: CMake: Simplify liblll config --- liblll/CMakeLists.txt | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) (limited to 'liblll') diff --git a/liblll/CMakeLists.txt b/liblll/CMakeLists.txt index 4246e481..ceaeb6cf 100644 --- a/liblll/CMakeLists.txt +++ b/liblll/CMakeLists.txt @@ -1,16 +1,6 @@ -cmake_policy(SET CMP0015 NEW) -set(CMAKE_AUTOMOC OFF) +file(GLOB sources "*.cpp") +file(GLOB headers "*.h") -aux_source_directory(. SRC_LIST) - -set(EXECUTABLE lll) - -file(GLOB HEADERS "*.h") - -include_directories(BEFORE ..) -add_library(${EXECUTABLE} ${SRC_LIST} ${HEADERS}) - -eth_use(${EXECUTABLE} REQUIRED Solidity::solevmasm) -#target_link_libraries(${EXECUTABLE} evmasm) - -install( TARGETS ${EXECUTABLE} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib LIBRARY DESTINATION lib ) +add_library(lll ${sources} ${headers}) +target_link_libraries(lll PUBLIC evmasm) +target_include_directories(lll PUBLIC ..) -- cgit From 99d198ffb034839e82649f10814210c0374d40d4 Mon Sep 17 00:00:00 2001 From: Paweł Bylica Date: Thu, 17 Aug 2017 15:48:39 +0200 Subject: CMake: Make libs dependencies explicit --- liblll/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'liblll') diff --git a/liblll/CMakeLists.txt b/liblll/CMakeLists.txt index ceaeb6cf..1cc37da3 100644 --- a/liblll/CMakeLists.txt +++ b/liblll/CMakeLists.txt @@ -2,5 +2,5 @@ file(GLOB sources "*.cpp") file(GLOB headers "*.h") add_library(lll ${sources} ${headers}) -target_link_libraries(lll PUBLIC evmasm) +target_link_libraries(lll PUBLIC evmasm devcore) target_include_directories(lll PUBLIC ..) -- cgit From 388fc983fa5480ec8498c399cf598991c63cfa22 Mon Sep 17 00:00:00 2001 From: Paweł Bylica Date: Tue, 22 Aug 2017 16:43:30 +0200 Subject: CMake: Cleanup "local" include path --- liblll/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) (limited to 'liblll') diff --git a/liblll/CMakeLists.txt b/liblll/CMakeLists.txt index 1cc37da3..4cdc073a 100644 --- a/liblll/CMakeLists.txt +++ b/liblll/CMakeLists.txt @@ -3,4 +3,3 @@ file(GLOB headers "*.h") add_library(lll ${sources} ${headers}) target_link_libraries(lll PUBLIC evmasm devcore) -target_include_directories(lll PUBLIC ..) -- cgit