cerc-io/solidity
15
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

client refactor

Browse Source
This commit is contained in:
debris 2015-08-27 14:28:31 +02:00
parent 66552f46a6
commit 1741e89c09
4 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.gitignore vendored
View File

@ -28,4 +28,7 @@
*.app *.app
# Build directory # Build directory
build/ build/
# vim stuff
*.swp

5
libsolidity/CMakeLists.txt
View File

@ -10,12 +10,9 @@ set(EXECUTABLE solidity)
file(GLOB HEADERS "*.h") file(GLOB HEADERS "*.h")
include_directories(BEFORE ..) include_directories(BEFORE ..)
include_directories(BEFORE ${JSONCPP_INCLUDE_DIRS})
add_library(${EXECUTABLE} ${SRC_LIST} ${HEADERS}) add_library(${EXECUTABLE} ${SRC_LIST} ${HEADERS})
eth_use(${EXECUTABLE} REQUIRED EthCore) eth_use(${EXECUTABLE} REQUIRED Eth::devcore Eth::evmasm)
target_link_libraries(${EXECUTABLE} ${JSONCPP_LIBRARIES})
install( TARGETS ${EXECUTABLE} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib LIBRARY DESTINATION lib ) install( TARGETS ${EXECUTABLE} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib LIBRARY DESTINATION lib )
install( FILES ${HEADERS} DESTINATION include/${EXECUTABLE} ) install( FILES ${HEADERS} DESTINATION include/${EXECUTABLE} )

7
solc/CMakeLists.txt
View File

@ -1,21 +1,16 @@
cmake_policy(SET CMP0015 NEW)
set(CMAKE_AUTOMOC OFF) set(CMAKE_AUTOMOC OFF)
aux_source_directory(. SRC_LIST) aux_source_directory(. SRC_LIST)
list(REMOVE_ITEM SRC_LIST "./jsonCompiler.cpp") list(REMOVE_ITEM SRC_LIST "./jsonCompiler.cpp")
include_directories(BEFORE ${JSONCPP_INCLUDE_DIRS})
include_directories(BEFORE ..) include_directories(BEFORE ..)
include_directories(${Boost_INCLUDE_DIRS})
set(EXECUTABLE solc) set(EXECUTABLE solc)
file(GLOB HEADERS "*.h") file(GLOB HEADERS "*.h")
add_executable(${EXECUTABLE} ${SRC_LIST} ${HEADERS}) add_executable(${EXECUTABLE} ${SRC_LIST} ${HEADERS})
eth_use(${EXECUTABLE} REQUIRED EthCore) eth_use(${EXECUTABLE} REQUIRED Solidity)
target_link_libraries(${EXECUTABLE} solidity)
target_link_libraries(${EXECUTABLE} ${Boost_PROGRAM_OPTIONS_LIBRARIES}) target_link_libraries(${EXECUTABLE} ${Boost_PROGRAM_OPTIONS_LIBRARIES})
if (APPLE) if (APPLE)

6
test/CMakeLists.txt
View File

@ -44,14 +44,10 @@ file(GLOB HEADERS "*.h")
set(EXECUTABLE soltest) set(EXECUTABLE soltest)
add_executable(${EXECUTABLE} ${SRC_LIST} ${HEADERS}) add_executable(${EXECUTABLE} ${SRC_LIST} ${HEADERS})
eth_use(${EXECUTABLE} REQUIRED EthCore) eth_use(${EXECUTABLE} REQUIRED Solidity Eth::ethereum)
include_directories(BEFORE ..) include_directories(BEFORE ..)
include_directories(BEFORE ${JSONCPP_INCLUDE_DIRS})
target_link_libraries(${EXECUTABLE} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARIES}) 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() enable_testing()
set(CTEST_OUTPUT_ON_FAILURE TRUE) set(CTEST_OUTPUT_ON_FAILURE TRUE)