diff --git a/CMakeLists.txt b/CMakeLists.txt index edf57debe..5ca9aa5cf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -41,7 +41,7 @@ option(TOOLS "Build the tools components" ON) option(GUI "Build GUI components (AlethZero, Mix)" ON) option(TESTS "Build the tests." ON) option(NOBOOST "No use of boost macros in test functions" OFF) -option(EVMJIT "Build just-in-time compiler for EVM code (requires LLVM)" OFF) +option(EVMJIT "Build just-in-time compiler for EVM code (requires LLVM)" ON) option(ETHASHCL "Build in support for GPU mining via OpenCL" ON) option(JSCONSOLE "Build in javascript console" ON) option(FRONTIER "Build for Frontier network" OFF) @@ -391,9 +391,14 @@ else() endif() if (EVMJIT) - if (CMAKE_SYSTEM_NAME STREQUAL "Windows" AND NOT DEFINED LLVM_DIR) - set(LLVM_DIR "${CMAKE_SOURCE_DIR}/extdep/install/windows/x64/share/llvm/cmake") + if (NOT DEFINED LLVM_DIR) + if (CMAKE_SYSTEM_NAME STREQUAL "Windows") + set(LLVM_DIR "${CMAKE_SOURCE_DIR}/extdep/install/windows/x64/share/llvm/cmake") + elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin") + set(LLVM_DIR "/usr/local/opt/llvm/share/llvm/cmake") + endif() endif() + set(EVMJIT_CPP TRUE) # include CPP-JIT connector add_subdirectory(evmjit) if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")