From 8d00fd3845615597dbbdc2a1af78feb34f91bcf0 Mon Sep 17 00:00:00 2001 From: Chris Ray Date: Wed, 29 Jun 2016 14:21:43 -0400 Subject: [PATCH] Fixed MONO_API_VERSION define for the cmake build. For #cmakedefine to work, the variable needs to be declared in the cmake script otherwise it will be commented out in the generated file. --- CMakeLists.txt | 1 + include/llvm/Config/llvm-config.h.cmake | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index cdaf3bbd166..b7de6cecf4c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,6 +28,7 @@ set(CMAKE_MODULE_PATH set(LLVM_VERSION_MAJOR 3) set(LLVM_VERSION_MINOR 6) set(LLVM_VERSION_PATCH 0) +set(MONO_API_VERSION 4) if (NOT PACKAGE_VERSION) set(PACKAGE_VERSION "${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}svn") diff --git a/include/llvm/Config/llvm-config.h.cmake b/include/llvm/Config/llvm-config.h.cmake index bda5eaf512d..2c8622060df 100644 --- a/include/llvm/Config/llvm-config.h.cmake +++ b/include/llvm/Config/llvm-config.h.cmake @@ -95,6 +95,6 @@ /* Define if we link Polly to the tools */ #cmakedefine LINK_POLLY_INTO_TOOLS -#cmakedefine MONO_API_VERSION 4 +#cmakedefine MONO_API_VERSION ${MONO_API_VERSION} #endif