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
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index f4af4e0..0418b1c 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()
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 86f94cd..496ba3d 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -32,7 +32,7 @@
${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg
@ONLY)
- add_custom_target(check
+ add_custom_target(check-libcxx
COMMAND ${PYTHON_EXECUTABLE}
${LIT_EXECUTABLE}
${LIT_ARGS}