summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorReid Kleckner <reid@kleckner.net>2015-02-27 18:22:46 +0000
committerReid Kleckner <reid@kleckner.net>2015-02-27 18:22:46 +0000
commit2e3d1e056c8dc2754b932a52a16bb0558f0e5e3d (patch)
treebe27445605b506dd71932e3bb2d3d18f02b99d65
parent629cdbae948a101e6e20784e6d0e86929030462e (diff)
downloadbcm5719-llvm-2e3d1e056c8dc2754b932a52a16bb0558f0e5e3d.tar.gz
bcm5719-llvm-2e3d1e056c8dc2754b932a52a16bb0558f0e5e3d.zip
Minor follow-ups to r229720 suggested on llvmdev
"svn" patch by Sedat Dilek plus trimming whitespace added in r229720. llvm-svn: 230773
-rw-r--r--llvm/CMakeLists.txt3
-rw-r--r--llvm/cmake/modules/AddLLVM.cmake2
2 files changed, 3 insertions, 2 deletions
diff --git a/llvm/CMakeLists.txt b/llvm/CMakeLists.txt
index ed7aeb026f5..5dda69629e1 100644
--- a/llvm/CMakeLists.txt
+++ b/llvm/CMakeLists.txt
@@ -66,7 +66,8 @@ set(LLVM_VERSION_PATCH 0)
set(LLVM_VERSION_SUFFIX svn)
if (NOT PACKAGE_VERSION)
- set(PACKAGE_VERSION "${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}svn")
+ set(PACKAGE_VERSION
+ "${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}${LLVM_VERSION_SUFFIX}")
endif()
option(LLVM_INSTALL_TOOLCHAIN_ONLY "Only include toolchain files in the 'install' target." OFF)
diff --git a/llvm/cmake/modules/AddLLVM.cmake b/llvm/cmake/modules/AddLLVM.cmake
index 7f6364428ca..6c7ac067598 100644
--- a/llvm/cmake/modules/AddLLVM.cmake
+++ b/llvm/cmake/modules/AddLLVM.cmake
@@ -338,7 +338,7 @@ function(llvm_add_library name)
PREFIX ""
)
endif()
-
+
set_target_properties(${name}
PROPERTIES
SOVERSION ${LLVM_VERSION_MAJOR}
OpenPOWER on IntegriCloud