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

Added LLVM_DIR for OSX #6258

Merged
merged 3 commits into from
Nov 20, 2018
Merged

Added LLVM_DIR for OSX #6258

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
360777a
Added LLVM_DIR for OSX
larryk85 Nov 6, 2018
c7fb17e
Update EosioTester.cmake.in
larryk85 Nov 20, 2018
3727308
Update EosioTesterBuild.cmake.in
larryk85 Nov 20, 2018
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
9 changes: 9 additions & 0 deletions CMakeModules/EosioTester.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,15 @@ set(EOSIO_VERSION "@VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@")

enable_testing()

if (UNIX)
if (APPLE)
if (LLVM_DIR STREQUAL "" OR NOT LLVM_DIR)
set(LLVM_DIR "/usr/local/Cellar/llvm@4/4.0.1/lib/cmake/llvm")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not have the path be /usr/local/opt/llvm@4/lib/cmake/llvm? That way you don't have a dependency on the particular minor and patch release of LLVM? And that symlink should exist even if the user brew unlinks llvm@4.

Same goes for the path in EosioTesterBuild.cmake.in.

endif()
endif()
endif()


find_package( Gperftools QUIET )
if( GPERFTOOLS_FOUND )
message( STATUS "Found gperftools; compiling tests with TCMalloc")
Expand Down
9 changes: 9 additions & 0 deletions CMakeModules/EosioTesterBuild.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,15 @@ set(EOSIO_VERSION "@VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@")

enable_testing()

if (UNIX)
if (APPLE)
if (LLVM_DIR STREQUAL "" OR NOT LLVM_DIR)
set(LLVM_DIR "/usr/local/Cellar/llvm@4/4.0.1/lib/cmake/llvm")
endif()
endif()
endif()


find_package( Gperftools QUIET )
if( GPERFTOOLS_FOUND )
message( STATUS "Found gperftools; compiling tests with TCMalloc")
Expand Down