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/D23092

llvm-svn: 278030
This commit is contained in:
Eugene Zelenko 2016-08-08 17:59:02 +00:00
parent 5608df9b6a
commit 9d09275fa6
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libcxxabi/CMakeLists.txt
View File

@ -64,7 +64,7 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
endif() endif()
set(PACKAGE_NAME libcxxabi) 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_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}")
set(PACKAGE_BUGREPORT "llvm-bugs@lists.llvm.org") set(PACKAGE_BUGREPORT "llvm-bugs@lists.llvm.org")
@ -189,8 +189,7 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${LIBCXXABI_LIBRARY_DIR})
if (NOT LIBCXXABI_LIBCXX_LIBRARY_PATH) if (NOT LIBCXXABI_LIBCXX_LIBRARY_PATH)
set(LIBCXXABI_LIBCXX_LIBRARY_PATH "${LIBCXXABI_LIBRARY_DIR}" CACHE PATH set(LIBCXXABI_LIBCXX_LIBRARY_PATH "${LIBCXXABI_LIBRARY_DIR}" CACHE PATH
"The path to libc++ library.") "The path to libc++ library.")
endif () endif()
# Check that we can build with 32 bits if requested. # Check that we can build with 32 bits if requested.
if (CMAKE_SIZEOF_VOID_P EQUAL 8 AND NOT WIN32) if (CMAKE_SIZEOF_VOID_P EQUAL 8 AND NOT WIN32)
@ -246,7 +245,7 @@ endif()
if (LIBCXXABI_USE_COMPILER_RT) if (LIBCXXABI_USE_COMPILER_RT)
list(APPEND LIBCXXABI_LINK_FLAGS "-rtlib=compiler-rt") list(APPEND LIBCXXABI_LINK_FLAGS "-rtlib=compiler-rt")
endif () endif()
append_if(LIBCXXABI_COMPILE_FLAGS LIBCXXABI_HAS_WERROR_FLAG -Werror=return-type) append_if(LIBCXXABI_COMPILE_FLAGS LIBCXXABI_HAS_WERROR_FLAG -Werror=return-type)
@ -383,7 +382,7 @@ if (LIBCXXABI_USE_LLVM_UNWINDER OR LLVM_NATIVE_ARCH MATCHES ARM)
include_directories("${LIBCXXABI_LIBUNWIND_INCLUDES_INTERNAL}") include_directories("${LIBCXXABI_LIBUNWIND_INCLUDES_INTERNAL}")
include_directories("${LIBCXXABI_LIBUNWIND_SOURCES}") include_directories("${LIBCXXABI_LIBUNWIND_SOURCES}")
endif () endif()
# Add source code. This also contains all of the logic for deciding linker flags # Add source code. This also contains all of the logic for deciding linker flags
# soname, etc... # soname, etc...