Author: eugenezelenko Date: Mon Aug 8 13:01:50 2016 New Revision: 278032 URL: http://llvm.org/viewvc/llvm-project?rev=278032&view=rev Log: CMakeLists.txt cleanups: synchronize version with rest of LLVM, consistent spacing.
Differential revision: https://reviews.llvm.org/D23091 Modified: libcxx/trunk/CMakeLists.txt Modified: libcxx/trunk/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/CMakeLists.txt?rev=278032&r1=278031&r2=278032&view=diff ============================================================================== --- libcxx/trunk/CMakeLists.txt (original) +++ libcxx/trunk/CMakeLists.txt Mon Aug 8 13:01:50 2016 @@ -26,10 +26,10 @@ if (LIBCXX_BUILT_STANDALONE) project(libcxx CXX C) set(PACKAGE_NAME libcxx) - set(PACKAGE_VERSION trunk-svn) + set(PACKAGE_VERSION 4.0.0svn) set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") set(PACKAGE_BUGREPORT "llvm-b...@lists.llvm.org") -endif () +endif() if (LIBCXX_BUILT_STANDALONE AND NOT LLVM_FOUND) message(WARNING "UNSUPPORTED LIBCXX CONFIGURATION DETECTED: " @@ -81,12 +81,12 @@ if (NOT LIBCXX_CXX_ABI) set(LIBCXX_CXX_ABI_LIBNAME "libcxxabi") set(LIBCXX_CXX_ABI_INCLUDE_PATHS "${CMAKE_SOURCE_DIR}/projects/libcxxabi/include") set(LIBCXX_CXX_ABI_INTREE 1) - else () + else() set(LIBCXX_CXX_ABI_LIBNAME "none") - endif () -else () + endif() +else() set(LIBCXX_CXX_ABI_LIBNAME "${LIBCXX_CXX_ABI}") -endif () +endif() # Use a static copy of the ABI library when linking libc++. This option # cannot be used with LIBCXX_ENABLE_ABI_LINKER_SCRIPT. @@ -307,7 +307,6 @@ endif() # headers add_compile_flags_if_supported(-nostdinc++) - # Warning flags =============================================================== add_definitions(-D_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) add_compile_flags_if_supported( _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
