Merge pull request #6780 from EOSIO/fix/llvm_dir_path

Fix/llvm dir path
EOSIO · Feb 19, 2019 · 2600ba9 · 2600ba9
2 parents 6ed86a1 + c52a7c2
commit 2600ba9
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 11 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -19,17 +19,11 @@ if (UNIX)
       execute_process(COMMAND xcrun --show-sdk-path
                       OUTPUT_VARIABLE CMAKE_OSX_SYSROOT
                       OUTPUT_STRIP_TRAILING_WHITESPACE)
+      list(APPEND CMAKE_PREFIX_PATH "/usr/local/opt/llvm@4")
+      list(APPEND CMAKE_PREFIX_PATH "/usr/local/opt/gettext")
    endif()
 endif()
 
-if (LLVM_DIR STREQUAL "" OR NOT LLVM_DIR)
-    set(LLVM_DIR "$ENV{HOME}/opt/llvm/lib/cmake/llvm")
-endif()
-
-if (BOOST_ROOT STREQUAL "" OR NOT BOOST_ROOT)
-    set(BOOST_ROOT "$ENV{HOME}/opt/boost")
-endif()
-
 include( GNUInstallDirs )
 include( VersionMacros )
 include( SetupTargetMacros )

diff --git a/CMakeModules/EosioTester.cmake.in b/CMakeModules/EosioTester.cmake.in
@@ -28,7 +28,6 @@ set( CMAKE_CXX_STANDARD 14 )
 set( CMAKE_CXX_EXTENSIONS ON )
 set( CXX_STANDARD_REQUIRED ON )
 
-set( BOOST_ROOT @BOOST_ROOT@ )
 if ( APPLE )
    set( CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -Wall -Wno-deprecated-declarations" )
 else ( APPLE )

diff --git a/CMakeModules/EosioTesterBuild.cmake.in b/CMakeModules/EosioTesterBuild.cmake.in
@@ -26,8 +26,6 @@ set( CMAKE_CXX_STANDARD 14 )
 set( CMAKE_CXX_EXTENSIONS ON )
 set( CXX_STANDARD_REQUIRED ON )
 
-set( BOOST_ROOT @BOOST_ROOT@ )
-
 if ( APPLE )
    set( CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -Wall -Wno-deprecated-declarations" )
 else ( APPLE )