From 784a176bc38c0dea540217dd5c7f6f0c77e89205 Mon Sep 17 00:00:00 2001 From: Oscar Fuentes Date: Mon, 20 Dec 2010 09:47:13 +0000 Subject: [PATCH] New cmake option LLVM_APPEND_VC_REV for controlling when the VC revision id is appended to the LLVM version string. Defaults to OFF. Until now the VC revision id was always appended to the revision string whenever cmake was invoked (either explicitly or implicitly because a cmake source file changed). This was causing massive recompilations because config.h are reconfigured with the new contents of PACKAGE_VERSION. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@122240 91177308-0d34-0410-b5e6-96231b3b80d8 --- CMakeLists.txt | 9 ++++++++- docs/CMake.html | 6 ++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index df2f8d5d512..3f48b58f438 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,8 +11,15 @@ set(CMAKE_MODULE_PATH ) set(PACKAGE_VERSION "2.9") + include(VersionFromVCS) -add_version_info_from_vcs(PACKAGE_VERSION) + +option(LLVM_APPEND_VC_REV + "Append the version control system revision id to LLVM version" OFF) + +if( LLVM_APPEND_VC_REV ) + add_version_info_from_vcs(PACKAGE_VERSION) +endif() set(PACKAGE_NAME llvm) set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") diff --git a/docs/CMake.html b/docs/CMake.html index c5c55382649..0bafedd9b09 100644 --- a/docs/CMake.html +++ b/docs/CMake.html @@ -286,6 +286,12 @@ ON. You can use that option for disabling the generation of build targets for the LLVM unit tests. +
LLVM_APPEND_VC_REV:BOOL
+
Append version control revision info (svn revision number or git + revision id) to LLVM version string (stored in the PACKAGE_VERSION + macro). For this to work cmake must be invoked before the + build. Defaults to OFF.
+
LLVM_ENABLE_THREADS:BOOL
Build with threads support, if available. Defaults to ON.
-- 2.11.0