aboutsummaryrefslogtreecommitdiffstats
path: root/cmake/UseSolidity.cmake
diff options
context:
space:
mode:
authorBob Summerwill <bob@summerwill.net>2016-08-01 13:25:37 +0800
committerBob Summerwill <bob@summerwill.net>2016-08-01 16:45:11 +0800
commit4ee2114127f87b08b76b3ca94cde80a49cdc056a (patch)
treeb680926d0da4aadfddae0db9567557802f2c2929 /cmake/UseSolidity.cmake
parent56727d61a61e1485c8360f00700d766632ec7163 (diff)
downloaddexon-solidity-4ee2114127f87b08b76b3ca94cde80a49cdc056a.tar
dexon-solidity-4ee2114127f87b08b76b3ca94cde80a49cdc056a.tar.gz
dexon-solidity-4ee2114127f87b08b76b3ca94cde80a49cdc056a.tar.bz2
dexon-solidity-4ee2114127f87b08b76b3ca94cde80a49cdc056a.tar.lz
dexon-solidity-4ee2114127f87b08b76b3ca94cde80a49cdc056a.tar.xz
dexon-solidity-4ee2114127f87b08b76b3ca94cde80a49cdc056a.tar.zst
dexon-solidity-4ee2114127f87b08b76b3ca94cde80a49cdc056a.zip
Make the Solidity repository standalone.
This commit is the culmination of several months of work to decouple Solidity from the webthree-umbrella so that it can be developed in parallel with cpp-ethereum (the Ethereum C++ runtime) and so that even for the Solidity unit-tests there is no hard-dependency onto the C++ runtime. The Tests-over-IPC refactoring was a major step in the same process which was already committed. This commit contains the following changes: - A subset of the CMake functionality in webthree-helpers was extracted and tailored for Solidity into ./cmake. Further cleanup is certainly possible. - A subset of the libdevcore functionality in libweb3core was extracted and tailored for Solidity into ./libdevcore. Further cleanup is certainly possible - The gas price constants in EVMSchedule were orphaned into libevmasm. - Some other refactorings and cleanups were made to sever unnecessary EVM dependencies in the Solidity unit-tests. - TravisCI and Appveyor support was added, covering builds and running of the unit-tests (Linux and macOS only for now) - A bug-fix was made to get the Tests-over-IPC running on macOS. - There are still reliability issues in the unit-tests, which need immediate attention. The Travis build has been flipped to run the unit-tests 5 times, to try to flush these out. - The Emscripten automation which was previously in webthree-umbrella was merged into the TravisCI automation here. - The development ZIP deployment step has been commented out, but we will want to read that ONLY for release branch. Further iteration on these changes will definitely be needed, but I feel these have got to sufficient maturity than holding them back further isn't winning us anything. It is go time :-)
Diffstat (limited to 'cmake/UseSolidity.cmake')
-rw-r--r--cmake/UseSolidity.cmake33
1 files changed, 33 insertions, 0 deletions
diff --git a/cmake/UseSolidity.cmake b/cmake/UseSolidity.cmake
new file mode 100644
index 00000000..46e2cac9
--- /dev/null
+++ b/cmake/UseSolidity.cmake
@@ -0,0 +1,33 @@
+function(eth_apply TARGET REQUIRED SUBMODULE)
+
+ set(SOL_DIR "${ETH_CMAKE_DIR}/.." CACHE PATH "The path to the solidity directory")
+ set(SOL_BUILD_DIR_NAME "build" CACHE STRING "The name of the build directory in solidity repo")
+ set(SOL_BUILD_DIR "${SOL_DIR}/${SOL_BUILD_DIR_NAME}")
+ set(CMAKE_LIBRARY_PATH ${SOL_BUILD_DIR};${CMAKE_LIBRARY_PATH})
+
+ find_package(Solidity)
+
+ # Hide confusing blank dependency information when using FindSolidity on itself.
+ if (NOT(${MODULE_MAIN} STREQUAL Solidity))
+ eth_show_dependency(SOLIDITY solidity)
+ endif()
+
+ target_include_directories(${TARGET} PUBLIC ${Solidity_INCLUDE_DIRS})
+
+ if (${SUBMODULE} STREQUAL "evmasm")
+ eth_use(${TARGET} ${REQUIRED} )
+ target_link_libraries(${TARGET} ${Solidity_EVMASM_LIBRARIES})
+ endif()
+
+ if (${SUBMODULE} STREQUAL "lll")
+ eth_use(${TARGET} ${REQUIRED} Solidity::evmasm)
+ target_link_libraries(${TARGET} ${Solidity_LLL_LIBRARIES})
+ endif()
+
+ if (${SUBMODULE} STREQUAL "solidity" OR ${SUBMODULE} STREQUAL "")
+ eth_use(${TARGET} ${REQUIRED} Dev::devcore Solidity::evmasm)
+ target_link_libraries(${TARGET} ${Solidity_SOLIDITY_LIBRARIES})
+ endif()
+
+ target_compile_definitions(${TARGET} PUBLIC ETH_SOLIDITY)
+endfunction()