[libcxx] r338096 - Add libc++fs to the test deps, and not to the target 'cxx'.

[Eric Fiselier via cfe-commits]

Author: ericwf
Date: Thu Jul 26 20:47:46 2018
New Revision: 338096

URL: http://llvm.org/viewvc/llvm-project?rev=338096&view=rev
Log:
Add libc++fs to the test deps, and not to the target 'cxx'.

Modified:
    libcxx/trunk/lib/CMakeLists.txt
    libcxx/trunk/test/CMakeLists.txt

Modified: libcxx/trunk/lib/CMakeLists.txt
URL: 
http://llvm.org/viewvc/llvm-project/libcxx/trunk/lib/CMakeLists.txt?rev=338096&r1=338095&r2=338096&view=diff
==============================================================================
--- libcxx/trunk/lib/CMakeLists.txt (original)
+++ libcxx/trunk/lib/CMakeLists.txt Thu Jul 26 20:47:46 2018
@@ -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)
 

Modified: libcxx/trunk/test/CMakeLists.txt
URL: 
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/CMakeLists.txt?rev=338096&r1=338095&r2=338096&view=diff
==============================================================================
--- libcxx/trunk/test/CMakeLists.txt (original)
+++ libcxx/trunk/test/CMakeLists.txt Thu Jul 26 20:47:46 2018
@@ -58,7 +58,10 @@ set(AUTO_GEN_COMMENT "## Autogenerated b
 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)


_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits