Skip to content
This repository has been archived by the owner on Aug 2, 2022. It is now read-only.

Fix/llvm dir path #6780

Merged
merged 3 commits into from
Feb 19, 2019
Merged

Fix/llvm dir path #6780

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d44fbcf
changed LLVM_DIR and Intl_INCLUDE_DIR for Apple builds
larryk85 Feb 19, 2019
7ddb160
removed unneeded variable setting
larryk85 Feb 19, 2019
c52a7c2
Update CMakeLists.txt
larryk85 Feb 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
Expand Down
1 change: 0 additions & 1 deletion CMakeModules/EosioTester.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
Expand Down
2 changes: 0 additions & 2 deletions CMakeModules/EosioTesterBuild.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
Expand Down