diff options
| -rw-r--r-- | libcxx/lib/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | libcxx/test/CMakeLists.txt | 5 |
2 files changed, 7 insertions, 8 deletions
diff --git a/libcxx/lib/CMakeLists.txt b/libcxx/lib/CMakeLists.txt index 322fce43f2f..e068edc8a7a 100644 --- a/libcxx/lib/CMakeLists.txt +++ b/libcxx/lib/CMakeLists.txt @@ -288,6 +288,9 @@ if (LIBCXX_ENABLE_STATIC) endif() endif() +# Add a meta-target for both libraries. +add_custom_target(cxx DEPENDS cxx-headers ${LIBCXX_BUILD_TARGETS}) + if (LIBCXX_ENABLE_FILESYSTEM) set(LIBCXX_FILESYSTEM_SOURCES ../src/filesystem/operations.cpp @@ -318,7 +321,6 @@ if (LIBCXX_ENABLE_FILESYSTEM) COMPILE_FLAGS "${filesystem_flags}" OUTPUT_NAME "c++fs" ) - list(APPEND LIBCXX_BUILD_TARGETS cxx_filesystem) endif() @@ -341,14 +343,8 @@ if (LIBCXX_ENABLE_EXPERIMENTAL_LIBRARY) COMPILE_FLAGS "${experimental_flags}" OUTPUT_NAME "c++experimental" ) - list(APPEND LIBCXX_BUILD_TARGETS cxx_experimental) endif() - -# Add a meta-target for both libraries. -add_custom_target(cxx DEPENDS cxx-headers ${LIBCXX_BUILD_TARGETS}) - - if (LIBCXX_BUILD_EXTERNAL_THREAD_LIBRARY) file(GLOB LIBCXX_EXTERNAL_THREADING_SUPPORT_SOURCES ../test/support/external_threads.cpp) diff --git a/libcxx/test/CMakeLists.txt b/libcxx/test/CMakeLists.txt index 6492949d96a..f8442460a2f 100644 --- a/libcxx/test/CMakeLists.txt +++ b/libcxx/test/CMakeLists.txt @@ -58,7 +58,10 @@ set(AUTO_GEN_COMMENT "## Autogenerated by libcxx configuration.\n# Do not edit!" set(LIBCXX_TEST_DEPS "") 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() if (LIBCXX_BUILD_EXTERNAL_THREAD_LIBRARY) |
