Index: CMakeLists.txt =================================================================== --- CMakeLists.txt +++ CMakeLists.txt @@ -64,7 +64,7 @@ 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-bugs@lists.llvm.org") @@ -189,9 +189,8 @@ 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) if (LIBCXXABI_BUILD_32_BITS AND NOT LLVM_BUILD_32_BITS) # Don't duplicate the output from LLVM @@ -246,7 +245,7 @@ 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 @@ 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...