From 360777a7f9a80beca382f608b3ea268aee7e0a12 Mon Sep 17 00:00:00 2001 From: Bucky Kittinger Date: Tue, 6 Nov 2018 17:57:08 -0500 Subject: [PATCH 1/3] Added LLVM_DIR for OSX --- CMakeModules/EosioTester.cmake.in | 9 +++++++++ CMakeModules/EosioTesterBuild.cmake.in | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/CMakeModules/EosioTester.cmake.in b/CMakeModules/EosioTester.cmake.in index f47743fe5cb..572a1339bc6 100644 --- a/CMakeModules/EosioTester.cmake.in +++ b/CMakeModules/EosioTester.cmake.in @@ -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") diff --git a/CMakeModules/EosioTesterBuild.cmake.in b/CMakeModules/EosioTesterBuild.cmake.in index 5618fe0d149..b9ee4b5bd67 100644 --- a/CMakeModules/EosioTesterBuild.cmake.in +++ b/CMakeModules/EosioTesterBuild.cmake.in @@ -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") From c7fb17ef4235835203709e29419866a3088fc862 Mon Sep 17 00:00:00 2001 From: Bucky Kittinger Date: Tue, 20 Nov 2018 10:06:30 -0500 Subject: [PATCH 2/3] Update EosioTester.cmake.in --- CMakeModules/EosioTester.cmake.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeModules/EosioTester.cmake.in b/CMakeModules/EosioTester.cmake.in index 572a1339bc6..741ee5f0e84 100644 --- a/CMakeModules/EosioTester.cmake.in +++ b/CMakeModules/EosioTester.cmake.in @@ -11,7 +11,7 @@ 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") + set(LLVM_DIR "/usr/local/opt/llvm@4/lib/cmake/llvm") endif() endif() endif() From 37273083c0a606f55b6d4e6eed254e0f9d35f51d Mon Sep 17 00:00:00 2001 From: Bucky Kittinger Date: Tue, 20 Nov 2018 10:08:20 -0500 Subject: [PATCH 3/3] Update EosioTesterBuild.cmake.in --- CMakeModules/EosioTesterBuild.cmake.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeModules/EosioTesterBuild.cmake.in b/CMakeModules/EosioTesterBuild.cmake.in index b9ee4b5bd67..04ac7da6fe5 100644 --- a/CMakeModules/EosioTesterBuild.cmake.in +++ b/CMakeModules/EosioTesterBuild.cmake.in @@ -11,7 +11,7 @@ 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") + set(LLVM_DIR "/usr/local/opt/llvm@4/lib/cmake/llvm") endif() endif() endif()