[libcxx-commits] [libcxxabi] r373949 - [libc++abi] Introduce a LIBCXXABI_LIBRARY_VERSION option

[Louis Dionne via libcxx-commits]

Author: ldionne
Date: Mon Oct  7 12:22:04 2019
New Revision: 373949

URL: http://llvm.org/viewvc/llvm-project?rev=373949&view=rev
Log:
[libc++abi] Introduce a LIBCXXABI_LIBRARY_VERSION option

That option controls the 'VERSION' attribute of the libc++abi shared
library, which in turn controls the name of the actual dylib being
produced.

Modified:
    libcxxabi/trunk/CMakeLists.txt
    libcxxabi/trunk/src/CMakeLists.txt

Modified: libcxxabi/trunk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/libcxxabi/trunk/CMakeLists.txt?rev=373949&r1=373948&r2=373949&view=diff
==============================================================================
--- libcxxabi/trunk/CMakeLists.txt (original)
+++ libcxxabi/trunk/CMakeLists.txt Mon Oct  7 12:22:04 2019
@@ -77,6 +77,11 @@ set(LIBCXXABI_TARGET_TRIPLE "" CACHE STR
 set(LIBCXXABI_GCC_TOOLCHAIN "" CACHE PATH "GCC toolchain for cross compiling.")
 set(LIBCXXABI_SYSROOT "" CACHE PATH "Sysroot for cross compiling.")
 set(LIBCXXABI_LIBCXX_LIBRARY_PATH "" CACHE PATH "The path to libc++ library.")
+set(LIBCXXABI_LIBRARY_VERSION "1.0" CACHE STRING
+"Version of libc++abi. This will be reflected in the name of the shared \
+library produced. For example, -DLIBCXXABI_LIBRARY_VERSION=x.y will \
+result in the library being named libc++abi.x.y.dylib, along with the \
+usual symlinks pointing to that.")
 
 # Default to building a shared library so that the default options still test
 # the libc++abi that is being built. There are two problems with testing a

Modified: libcxxabi/trunk/src/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/libcxxabi/trunk/src/CMakeLists.txt?rev=373949&r1=373948&r2=373949&view=diff
==============================================================================
--- libcxxabi/trunk/src/CMakeLists.txt (original)
+++ libcxxabi/trunk/src/CMakeLists.txt Mon Oct  7 12:22:04 2019
@@ -176,7 +176,7 @@ if (LIBCXXABI_ENABLE_SHARED)
                           SOVERSION
                             "1"
                           VERSION
-                            "1.0"
+                            "${LIBCXXABI_LIBRARY_VERSION}"
                           DEFINE_SYMBOL
                             "")