[libcxxabi] r278044 - Merging r278030 with version number adjusted:
Hans Wennborg via cfe-commits
cfe-commits at lists.llvm.org
Mon Aug 8 13:06:28 PDT 2016
Author: hans
Date: Mon Aug 8 15:06:27 2016
New Revision: 278044
URL: http://llvm.org/viewvc/llvm-project?rev=278044&view=rev
Log:
Merging r278030 with version number adjusted:
------------------------------------------------------------------------
r278030 | eugenezelenko | 2016-08-08 10:59:02 -0700 (Mon, 08 Aug 2016) | 4 lines
CMakeLists.txt cleanups: synchronize version with rest of LLVM, consistent spacing.
Differential revision: https://reviews.llvm.org/D23092
------------------------------------------------------------------------
Modified:
libcxxabi/branches/release_39/ (props changed)
libcxxabi/branches/release_39/CMakeLists.txt
Propchange: libcxxabi/branches/release_39/
------------------------------------------------------------------------------
svn:mergeinfo = /libcxxabi/trunk:278030
Modified: libcxxabi/branches/release_39/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/libcxxabi/branches/release_39/CMakeLists.txt?rev=278044&r1=278043&r2=278044&view=diff
==============================================================================
--- libcxxabi/branches/release_39/CMakeLists.txt (original)
+++ libcxxabi/branches/release_39/CMakeLists.txt Mon Aug 8 15:06:27 2016
@@ -64,7 +64,7 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURR
endif()
set(PACKAGE_NAME libcxxabi)
- set(PACKAGE_VERSION 3.7.0svn)
+ set(PACKAGE_VERSION 3.9.0)
set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}")
set(PACKAGE_BUGREPORT "llvm-bugs at lists.llvm.org")
@@ -189,8 +189,7 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${LIB
if (NOT LIBCXXABI_LIBCXX_LIBRARY_PATH)
set(LIBCXXABI_LIBCXX_LIBRARY_PATH "${LIBCXXABI_LIBRARY_DIR}" CACHE PATH
"The path to libc++ library.")
-endif ()
-
+endif()
# Check that we can build with 32 bits if requested.
if (CMAKE_SIZEOF_VOID_P EQUAL 8 AND NOT WIN32)
@@ -246,7 +245,7 @@ endif()
if (LIBCXXABI_USE_COMPILER_RT)
list(APPEND LIBCXXABI_LINK_FLAGS "-rtlib=compiler-rt")
-endif ()
+endif()
append_if(LIBCXXABI_COMPILE_FLAGS LIBCXXABI_HAS_WERROR_FLAG -Werror=return-type)
@@ -383,7 +382,7 @@ if (LIBCXXABI_USE_LLVM_UNWINDER OR LLVM_
include_directories("${LIBCXXABI_LIBUNWIND_INCLUDES_INTERNAL}")
include_directories("${LIBCXXABI_LIBUNWIND_SOURCES}")
-endif ()
+endif()
# Add source code. This also contains all of the logic for deciding linker flags
# soname, etc...
More information about the cfe-commits
mailing list