diff options
author | Howard Hinnant <hhinnant@apple.com> | 2012-03-19 15:40:23 +0000 |
---|---|---|
committer | Howard Hinnant <hhinnant@apple.com> | 2012-03-19 15:40:23 +0000 |
commit | 87c61a61fe68a584f93d001c8c55dd14ceb5a5a9 (patch) | |
tree | b9dd894862ff0684915aa5c8743f452ac3f5a0bd /lib | |
parent | 1378397721435d2737ab494908918bfe88882789 (diff) | |
download | libcxx_35a-87c61a61fe68a584f93d001c8c55dd14ceb5a5a9.tar.gz |
Allow libc++ to be built with CMake from within the LLVM tree. The libc++ part is just some renaming as the variable was already in use, conflicting with something else in the LLVM tree. Contributed by Ruben Van Boxem.
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@153036 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
-rw-r--r-- | lib/CMakeLists.txt | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index f4af4e06..0418b1c9 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -1,33 +1,33 @@ # Get sources -file(GLOB sources ../src/*.cpp) +file(GLOB LIBCXX_SOURCES ../src/*.cpp) if(WIN32) - file(GLOB win32_sources ../src/support/win32/*.cpp) - list(APPEND sources ${win32_sources}) + file(GLOB LIBCXX_WIN32_SOURCES ../src/support/win32/*.cpp) + list(APPEND LIBCXX_SOURCES ${LIBCXX_WIN32_SOURCES}) endif() # Add all the headers to the project for IDEs. if (MSVC_IDE OR XCODE) - file(GLOB_RECURSE headers ../include/*) + file(GLOB_RECURSE LIBCXX_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/../include/*) if(WIN32) - file( GLOB win32_headers ../include/support/win32/*.h) - list(APPEND headers ${win32_headers}) + file( GLOB LIBCXX_WIN32_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/../include/support/win32/*.h) + list(APPEND LIBCXX_HEADERS ${LIBCXX_WIN32_HEADERS}) endif() # Force them all into the headers dir on MSVC, otherwise they end up at # project scope because they don't have extensions. if (MSVC_IDE) - source_group("Header Files" FILES ${headers}) + source_group("Header Files" FILES ${LIBCXX_HEADERS}) endif() endif() if (LIBCXX_ENABLE_SHARED) add_library(cxx SHARED - ${sources} - ${headers} + ${LIBCXX_SOURCES} + ${LIBCXX_HEADERS} ) else() add_library(cxx STATIC - ${sources} - ${headers} + ${LIBCXX_SOURCES} + ${LIBCXX_HEADERS} ) endif() |