OSDN Git Service

Add support for a patch version to the cmake system.
authorEric Christopher <echristo@gmail.com>
Wed, 16 Apr 2014 23:15:28 +0000 (23:15 +0000)
committerEric Christopher <echristo@gmail.com>
Wed, 16 Apr 2014 23:15:28 +0000 (23:15 +0000)
Patch by Brad King

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@206425 91177308-0d34-0410-b5e6-96231b3b80d8

cmake/modules/LLVMConfig.cmake.in
cmake/modules/Makefile

index 2f8d037..780001a 100644 (file)
@@ -4,6 +4,7 @@
 
 set(LLVM_VERSION_MAJOR @LLVM_VERSION_MAJOR@)
 set(LLVM_VERSION_MINOR @LLVM_VERSION_MINOR@)
+set(LLVM_VERSION_PATCH @LLVM_VERSION_PATCH@)
 set(LLVM_PACKAGE_VERSION @PACKAGE_VERSION@)
 
 set(LLVM_COMMON_DEPENDS @LLVM_COMMON_DEPENDS@)
index 8f20ddf..817f911 100644 (file)
@@ -24,6 +24,7 @@ $(PROJ_OBJ_DIR)/LLVMConfig.cmake: LLVMConfig.cmake.in $(LLVMBuildCMakeFrag)
          -e 's/@LLVM_CONFIG_CODE@/set(LLVM_INSTALL_PREFIX "'"$(subst /,\/,$(PROJ_prefix))"'")/' \
          -e 's/@LLVM_VERSION_MAJOR@/'"$(LLVM_VERSION_MAJOR)"'/' \
          -e 's/@LLVM_VERSION_MINOR@/'"$(LLVM_VERSION_MINOR)"'/' \
+         -e 's/@LLVM_VERSION_PATCH@/'"$(LLVM_VERSION_PATCH)"'/' \
          -e 's/@PACKAGE_VERSION@/'"$(LLVMVersion)"'/' \
          -e 's/@LLVM_COMMON_DEPENDS@//' \
          -e 's/@LLVM_AVAILABLE_LIBS@/'"$(subst -l,,$(LLVMConfigLibs))"'/' \