maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

CMakeLists.txt cleanups: synchronize version with rest of LLVM, consistent spacing. 

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

llvm-svn: 278032
This commit is contained in:
Eugene Zelenko 2016-08-08 18:01:50 +00:00
parent f45fd2ba87
commit 772d11471c
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libcxx/CMakeLists.txt
View File

@ -26,10 +26,10 @@ if (LIBCXX_BUILT_STANDALONE)
project(libcxx CXX C) project(libcxx CXX C)
set(PACKAGE_NAME libcxx) set(PACKAGE_NAME libcxx)
set(PACKAGE_VERSION trunk-svn) set(PACKAGE_VERSION 4.0.0svn)
set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}")
set(PACKAGE_BUGREPORT "llvm-bugs@lists.llvm.org") set(PACKAGE_BUGREPORT "llvm-bugs@lists.llvm.org")
endif () endif()
if (LIBCXX_BUILT_STANDALONE AND NOT LLVM_FOUND) if (LIBCXX_BUILT_STANDALONE AND NOT LLVM_FOUND)
message(WARNING "UNSUPPORTED LIBCXX CONFIGURATION DETECTED: " 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_LIBNAME "libcxxabi")
set(LIBCXX_CXX_ABI_INCLUDE_PATHS "${CMAKE_SOURCE_DIR}/projects/libcxxabi/include") set(LIBCXX_CXX_ABI_INCLUDE_PATHS "${CMAKE_SOURCE_DIR}/projects/libcxxabi/include")
set(LIBCXX_CXX_ABI_INTREE 1) set(LIBCXX_CXX_ABI_INTREE 1)
else () else()
set(LIBCXX_CXX_ABI_LIBNAME "none") set(LIBCXX_CXX_ABI_LIBNAME "none")
endif () endif()
else () else()
set(LIBCXX_CXX_ABI_LIBNAME "${LIBCXX_CXX_ABI}") set(LIBCXX_CXX_ABI_LIBNAME "${LIBCXX_CXX_ABI}")
endif () endif()
# Use a static copy of the ABI library when linking libc++. This option # Use a static copy of the ABI library when linking libc++. This option
# cannot be used with LIBCXX_ENABLE_ABI_LINKER_SCRIPT. # cannot be used with LIBCXX_ENABLE_ABI_LINKER_SCRIPT.
@ -307,7 +307,6 @@ endif()
# headers # headers
add_compile_flags_if_supported(-nostdinc++) add_compile_flags_if_supported(-nostdinc++)
# Warning flags =============================================================== # Warning flags ===============================================================
add_definitions(-D_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) add_definitions(-D_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
add_compile_flags_if_supported( add_compile_flags_if_supported(