summaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorEric Christopher <echristo@gmail.com>2014-04-16 23:15:28 +0000
committerEric Christopher <echristo@gmail.com>2014-04-16 23:15:28 +0000
commit8e589975ea4c00b3250c497649075890798172af (patch)
tree7dba637d8ce416c7743ab4da780197421632c23a /cmake
parent6c35f5569282cb662c28131cc7826f6d2ce1baa8 (diff)
downloadllvm-8e589975ea4c00b3250c497649075890798172af.tar.gz
llvm-8e589975ea4c00b3250c497649075890798172af.tar.bz2
llvm-8e589975ea4c00b3250c497649075890798172af.tar.xz
Add support for a patch version to the cmake system.
Patch by Brad King git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@206425 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'cmake')
-rw-r--r--cmake/modules/LLVMConfig.cmake.in1
-rw-r--r--cmake/modules/Makefile1
2 files changed, 2 insertions, 0 deletions
diff --git a/cmake/modules/LLVMConfig.cmake.in b/cmake/modules/LLVMConfig.cmake.in
index 2f8d037af1..780001a1e8 100644
--- a/cmake/modules/LLVMConfig.cmake.in
+++ b/cmake/modules/LLVMConfig.cmake.in
@@ -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@)
diff --git a/cmake/modules/Makefile b/cmake/modules/Makefile
index 8f20ddf4dc..817f911ea7 100644
--- a/cmake/modules/Makefile
+++ b/cmake/modules/Makefile
@@ -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))"'/' \