Skip to content

Commit

Permalink
CMakeLists.txt cleanups: synchronize version with rest of LLVM, consi…
Browse files Browse the repository at this point in the history
…stent spacing.

Differential revision: https://reviews.llvm.org/D23091

llvm-svn: 278032
  • Loading branch information
EugeneZelenko committed Aug 8, 2016
1 parent f45fd2b commit 772d114
Showing 1 changed file with 6 additions and 7 deletions.
13 changes: 6 additions & 7 deletions libcxx/CMakeLists.txt
Expand Up @@ -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-bugs@lists.llvm.org")
endif ()
endif()

if (LIBCXX_BUILT_STANDALONE AND NOT LLVM_FOUND)
message(WARNING "UNSUPPORTED LIBCXX CONFIGURATION DETECTED: "
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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(
Expand Down

0 comments on commit 772d114

Please sign in to comment.