diff options
| author | Paweł Bylica <chfast@gmail.com> | 2017-08-16 19:30:09 +0800 |
|---|---|---|
| committer | Paweł Bylica <chfast@gmail.com> | 2017-08-18 19:32:36 +0800 |
| commit | 6f72025ee74d6255d40905ea09fa8a8dddf49605 (patch) | |
| tree | a48fc6be7d434e42c436da04f330d72bf8b76ab2 /solc | |
| parent | a874bd3f048125033250b8d7182dc30bbf36dbac (diff) | |
| download | dexon-solidity-6f72025ee74d6255d40905ea09fa8a8dddf49605.tar dexon-solidity-6f72025ee74d6255d40905ea09fa8a8dddf49605.tar.gz dexon-solidity-6f72025ee74d6255d40905ea09fa8a8dddf49605.tar.bz2 dexon-solidity-6f72025ee74d6255d40905ea09fa8a8dddf49605.tar.lz dexon-solidity-6f72025ee74d6255d40905ea09fa8a8dddf49605.tar.xz dexon-solidity-6f72025ee74d6255d40905ea09fa8a8dddf49605.tar.zst dexon-solidity-6f72025ee74d6255d40905ea09fa8a8dddf49605.zip | |
CMake: Simplify solc config
Diffstat (limited to 'solc')
| -rw-r--r-- | solc/CMakeLists.txt | 32 |
1 files changed, 12 insertions, 20 deletions
diff --git a/solc/CMakeLists.txt b/solc/CMakeLists.txt index 18e83e75..0563fe2a 100644 --- a/solc/CMakeLists.txt +++ b/solc/CMakeLists.txt @@ -1,27 +1,19 @@ -aux_source_directory(. SRC_LIST) -list(REMOVE_ITEM SRC_LIST "./jsonCompiler.cpp") +set( + sources + CommandLineInterface.cpp CommandLineInterface.h + main.cpp +) -include_directories(BEFORE ..) +add_executable(solc ${sources}) +target_link_libraries(solc PRIVATE solidity ${Boost_PROGRAM_OPTIONS_LIBRARIES}) -set(EXECUTABLE solc) - -file(GLOB HEADERS "*.h") -eth_simple_add_executable(${EXECUTABLE} ${SRC_LIST} ${HEADERS}) - -eth_use(${EXECUTABLE} REQUIRED Solidity::solidity) -target_link_libraries(${EXECUTABLE} ${Boost_PROGRAM_OPTIONS_LIBRARIES}) - -if (APPLE) - install(TARGETS ${EXECUTABLE} DESTINATION bin) -else() - eth_install_executable(${EXECUTABLE}) -endif() +include(GNUInstallDirs) +install(TARGETS solc DESTINATION "${CMAKE_INSTALL_BINDIR}") if (EMSCRIPTEN) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s EXPORTED_FUNCTIONS='[\"_compileJSON\",\"_license\",\"_version\",\"_compileJSONMulti\",\"_compileJSONCallback\",\"_compileStandard\"]' -s RESERVED_FUNCTION_POINTERS=20") - add_executable(soljson jsonCompiler.cpp ${HEADERS}) - eth_use(soljson REQUIRED Solidity::solidity) + add_executable(soljson jsonCompiler.cpp) else() - add_library(soljson jsonCompiler.cpp ${HEADERS}) - target_link_libraries(soljson solidity) + add_library(soljson jsonCompiler.cpp) endif() +target_link_libraries(soljson PRIVATE solidity)
\ No newline at end of file |