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.
mono · Jun 29, 2016 · 8d00fd3 · 8d00fd3
1 parent 73df95d
commit 8d00fd3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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