summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 6c35f55)
raw | patch | inline | side by side (parent: 6c35f55)
author | Eric Christopher <echristo@gmail.com> | |
Wed, 16 Apr 2014 23:15:28 +0000 (23:15 +0000) | ||
committer | Eric 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
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@206425 91177308-0d34-0410-b5e6-96231b3b80d8
cmake/modules/LLVMConfig.cmake.in | patch | blob | history | |
cmake/modules/Makefile | patch | blob | history |
index 2f8d037af1dadb0ee420bd173e0ca0fc6f091398..780001a1e8d25a5243bfc029df6af4a8491b99ca 100644 (file)
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 8f20ddf4dcd237d969acbc2a7e1c62c10357051a..817f911ea7c8760cbcfd23791bdaa7a0af1a69bc 100644 (file)
--- a/cmake/modules/Makefile
+++ b/cmake/modules/Makefile
-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))"'/' \