[PATCH] D23091: [libcxx] CMakeLists.txt cleanups: synchronize version with rest of LLVM, consistent spacing.
Phabricator via llvm-commits
llvm-commits at lists.llvm.org
Mon Aug 8 11:09:38 PDT 2016
This revision was automatically updated to reflect the committed changes.
Closed by commit rL278032: CMakeLists.txt cleanups: synchronize version with rest of LLVM, consistent… (authored by eugenezelenko).
Changed prior to commit:
https://reviews.llvm.org/D23091?vs=66574&id=67207#toc
Repository:
rL LLVM
https://reviews.llvm.org/D23091
Files:
libcxx/trunk/CMakeLists.txt
Index: libcxx/trunk/CMakeLists.txt
===================================================================
--- libcxx/trunk/CMakeLists.txt
+++ libcxx/trunk/CMakeLists.txt
@@ -26,10 +26,10 @@
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-bugs at lists.llvm.org")
-endif ()
+endif()
if (LIBCXX_BUILT_STANDALONE AND NOT LLVM_FOUND)
message(WARNING "UNSUPPORTED LIBCXX CONFIGURATION DETECTED: "
@@ -81,12 +81,12 @@
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 @@
# headers
add_compile_flags_if_supported(-nostdinc++)
-
# Warning flags ===============================================================
add_definitions(-D_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
add_compile_flags_if_supported(
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D23091.67207.patch
Type: text/x-patch
Size: 1296 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20160808/447facc9/attachment.bin>
More information about the llvm-commits
mailing list