aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Lattner <sabre@nondot.org>2009-01-28 17:49:03 +0000
committerChris Lattner <sabre@nondot.org>2009-01-28 17:49:03 +0000
commit8c46e8573e2c8b3e1f048c68c61e2fc452703234 (patch)
treec4e8bc8b05c64326ada43a3ac853c11d2f6e3c70
parentf560ffae1f1f6591859c7b70636a3eca6c03f083 (diff)
downloadexternal_llvm-8c46e8573e2c8b3e1f048c68c61e2fc452703234.zip
external_llvm-8c46e8573e2c8b3e1f048c68c61e2fc452703234.tar.gz
external_llvm-8c46e8573e2c8b3e1f048c68c61e2fc452703234.tar.bz2
Enable PACKAGE_VERSION in cmake builds, this unbreaks the clang build with cmake.
Patch by Piotr Rak! git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@63213 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--CMakeLists.txt3
-rw-r--r--include/llvm/Config/config.h.cmake2
2 files changed, 3 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2072c70..3dcc5e4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,8 @@ project(LLVM)
cmake_minimum_required(VERSION 2.6.1)
set(PACKAGE_NAME llvm)
-set(PACKAGE_VERSION svn)
+set(PACKAGE_VERSION 2.6svn)
+set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}")
set(PACKAGE_BUGREPORT "llvmbugs@cs.uiuc.edu")
if( CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR AND NOT MSVC_IDE )
diff --git a/include/llvm/Config/config.h.cmake b/include/llvm/Config/config.h.cmake
index d5e286b..12846fe 100644
--- a/include/llvm/Config/config.h.cmake
+++ b/include/llvm/Config/config.h.cmake
@@ -507,7 +507,7 @@
#cmakedefine PACKAGE_NAME "${PACKAGE_NAME}"
/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
+#cmakedefine PACKAGE_STRING "${PACKAGE_STRING}"
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME