Merged to 3.9 in r278044 with the version number adjusted.
On Mon, Aug 8, 2016 at 10:59 AM, Eugene Zelenko via cfe-commits <cfe-commits@lists.llvm.org> wrote: > Author: eugenezelenko > Date: Mon Aug 8 12:59:02 2016 > New Revision: 278030 > > URL: http://llvm.org/viewvc/llvm-project?rev=278030&view=rev > Log: > CMakeLists.txt cleanups: synchronize version with rest of LLVM, consistent > spacing. > > Differential revision: https://reviews.llvm.org/D23092 > > Modified: > libcxxabi/trunk/CMakeLists.txt > > Modified: libcxxabi/trunk/CMakeLists.txt > URL: > http://llvm.org/viewvc/llvm-project/libcxxabi/trunk/CMakeLists.txt?rev=278030&r1=278029&r2=278030&view=diff > ============================================================================== > --- libcxxabi/trunk/CMakeLists.txt (original) > +++ libcxxabi/trunk/CMakeLists.txt Mon Aug 8 12:59:02 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 4.0.0svn) > set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") > set(PACKAGE_BUGREPORT "llvm-b...@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... > > > _______________________________________________ > cfe-commits mailing list > cfe-commits@lists.llvm.org > http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits