diff options
| author | Gav Wood <g@ethdev.com> | 2015-08-20 17:01:33 +0800 |
|---|---|---|
| committer | Gav Wood <g@ethdev.com> | 2015-08-20 17:01:33 +0800 |
| commit | 38235cc9e14d442516a73b5a46260ad82255e3ff (patch) | |
| tree | 39fd4a279c6aa7fefa314e10b615bc37137905d4 /libsolidity | |
| parent | 4c8b2202575b8c169b6dda9f81a0c6f171361df9 (diff) | |
| parent | 8d9eb6830781cc107d09a92a59f71914a341ad3c (diff) | |
| download | dexon-solidity-38235cc9e14d442516a73b5a46260ad82255e3ff.tar.gz dexon-solidity-38235cc9e14d442516a73b5a46260ad82255e3ff.tar.zst dexon-solidity-38235cc9e14d442516a73b5a46260ad82255e3ff.zip | |
Merge pull request #6 from chriseth/cmakeUpdateTests
Modularise CMakeLists files and integrate tests.
Diffstat (limited to 'libsolidity')
| -rw-r--r-- | libsolidity/CMakeLists.txt | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libsolidity/CMakeLists.txt b/libsolidity/CMakeLists.txt index 787e5576..159405a2 100644 --- a/libsolidity/CMakeLists.txt +++ b/libsolidity/CMakeLists.txt @@ -5,20 +5,20 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSTATICLIB") aux_source_directory(. SRC_LIST) -include_directories(BEFORE ${JSONCPP_INCLUDE_DIRS}) -include_directories(BEFORE ..) -include_directories(${Boost_INCLUDE_DIRS}) - set(EXECUTABLE solidity) file(GLOB HEADERS "*.h") +include_directories(BEFORE ..) add_library(${EXECUTABLE} ${SRC_LIST} ${HEADERS}) add_dependencies(${EXECUTABLE} BuildInfo.h) target_link_libraries(${EXECUTABLE} ${JSONCPP_LIBRARIES}) -target_link_libraries(${EXECUTABLE} evmasm) -target_link_libraries(${EXECUTABLE} devcrypto) +target_link_libraries(${EXECUTABLE} ${Boost_LIBRARIES}) +target_link_libraries(${EXECUTABLE} ${ETH_DEVCORE_LIBRARY}) +target_link_libraries(${EXECUTABLE} ${ETH_EVMCORE_LIBRARY}) +target_link_libraries(${EXECUTABLE} ${ETH_EVMASM_LIBRARY}) +target_link_libraries(${EXECUTABLE} ${ETH_DEVCRYPTO_LIBRARY}) install( TARGETS ${EXECUTABLE} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib LIBRARY DESTINATION lib ) install( FILES ${HEADERS} DESTINATION include/${EXECUTABLE} ) |