LineageOS/android_external_libcxx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add libc++fs to the test deps, and not to the target 'cxx'.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@338096 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Eric Fiselier
2018-07-27 03:47:46 +00:00
parent 0be5527dc0
commit bc3f4035c3
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/CMakeLists.txt
View File

@@ -288,6 +288,9 @@ if (LIBCXX_ENABLE_STATIC)
endif() endif()
endif() endif()
# Add a meta-target for both libraries.
add_custom_target(cxx DEPENDS cxx-headers ${LIBCXX_BUILD_TARGETS})
if (LIBCXX_ENABLE_FILESYSTEM) if (LIBCXX_ENABLE_FILESYSTEM)
set(LIBCXX_FILESYSTEM_SOURCES set(LIBCXX_FILESYSTEM_SOURCES
../src/filesystem/operations.cpp ../src/filesystem/operations.cpp
@@ -318,7 +321,6 @@ if (LIBCXX_ENABLE_FILESYSTEM)
COMPILE_FLAGS "${filesystem_flags}" COMPILE_FLAGS "${filesystem_flags}"
OUTPUT_NAME "c++fs" OUTPUT_NAME "c++fs"
) )
list(APPEND LIBCXX_BUILD_TARGETS cxx_filesystem)
endif() endif()
@@ -341,14 +343,8 @@ if (LIBCXX_ENABLE_EXPERIMENTAL_LIBRARY)
COMPILE_FLAGS "${experimental_flags}" COMPILE_FLAGS "${experimental_flags}"
OUTPUT_NAME "c++experimental" OUTPUT_NAME "c++experimental"
) )
list(APPEND LIBCXX_BUILD_TARGETS cxx_experimental)
endif() endif()
# Add a meta-target for both libraries.
add_custom_target(cxx DEPENDS cxx-headers ${LIBCXX_BUILD_TARGETS})
if (LIBCXX_BUILD_EXTERNAL_THREAD_LIBRARY) if (LIBCXX_BUILD_EXTERNAL_THREAD_LIBRARY)
file(GLOB LIBCXX_EXTERNAL_THREADING_SUPPORT_SOURCES ../test/support/external_threads.cpp) file(GLOB LIBCXX_EXTERNAL_THREADING_SUPPORT_SOURCES ../test/support/external_threads.cpp)

5
test/CMakeLists.txt
View File

@@ -58,7 +58,10 @@ set(AUTO_GEN_COMMENT "## Autogenerated by libcxx configuration.\n# Do not edit!"
set(LIBCXX_TEST_DEPS "") set(LIBCXX_TEST_DEPS "")
if (LIBCXX_ENABLE_EXPERIMENTAL_LIBRARY) if (LIBCXX_ENABLE_EXPERIMENTAL_LIBRARY)
set(LIBCXX_TEST_DEPS cxx_experimental) list(APPEND LIBCXX_TEST_DEPS cxx_experimental)
endif()
if (LIBCXX_ENABLE_FILESYSTEM)
list(APPEND LIBCXX_TEST_DEPS cxx_filesystem)
endif() endif()
if (LIBCXX_BUILD_EXTERNAL_THREAD_LIBRARY) if (LIBCXX_BUILD_EXTERNAL_THREAD_LIBRARY)