From 38fc24db9f3f8b7c4f57eedcea22896f39f8dd35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Bylica?= Date: Sun, 19 Jul 2015 22:36:26 +0200 Subject: [PATCH 1/2] Ignore LLVM version requirements in cmake Currently brew installs version 3.8 as 3.7 has been branched. Version 3.7 is not available in homebrew as it has not been released yet. Ignore LLVM version requirement until 3.7 is released. --- evmjit/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evmjit/CMakeLists.txt b/evmjit/CMakeLists.txt index 6f0044b63..525bf974a 100644 --- a/evmjit/CMakeLists.txt +++ b/evmjit/CMakeLists.txt @@ -25,7 +25,7 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" AND NOT LLVM_DIR) add_definitions(-D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS) link_directories(/usr/lib/llvm-3.7/lib) else() - find_package(LLVM 3.7 REQUIRED CONFIG) + find_package(LLVM REQUIRED CONFIG) message(STATUS "Found LLVM ${LLVM_PACKAGE_VERSION}") message(STATUS "Using LLVMConfig.cmake in: ${LLVM_DIR}") add_definitions(${LLVM_DEFINITIONS}) From 3dbf11468f30d9216240ad564e80eab5aad8e0ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Bylica?= Date: Tue, 21 Jul 2015 13:25:56 +0200 Subject: [PATCH 2/2] Check LLVM version manually. --- evmjit/CMakeLists.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/evmjit/CMakeLists.txt b/evmjit/CMakeLists.txt index 525bf974a..325de3b77 100644 --- a/evmjit/CMakeLists.txt +++ b/evmjit/CMakeLists.txt @@ -26,7 +26,10 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" AND NOT LLVM_DIR) link_directories(/usr/lib/llvm-3.7/lib) else() find_package(LLVM REQUIRED CONFIG) - message(STATUS "Found LLVM ${LLVM_PACKAGE_VERSION}") + if (${LLVM_VERSION} VERSION_LESS 3.7) + message(FATAL_ERROR "Incompatible LLVM version ${LLVM_VERSION}") + endif() + message(STATUS "Found LLVM ${LLVM_VERSION}") message(STATUS "Using LLVMConfig.cmake in: ${LLVM_DIR}") add_definitions(${LLVM_DEFINITIONS}) llvm_map_components_to_libnames(LLVM_LIBS core support mcjit x86asmparser x86codegen ipo)