Revert "fixes duplicate header installation"

This reverts commit 0bd40d6c3da6719fecf77038673d453ff1eab25b.

llvm-svn: 210857

diff --git a/libcxx/CMakeLists.txt b/libcxx/CMakeLists.txt
index 723ac12..dd36b61 100644 (file)
--- a/libcxx/CMakeLists.txt
+++ b/libcxx/CMakeLists.txt
@@ -123,9 +123,13 @@ macro(setup_abi_lib abipathvar abidefines abilibs abifiles abidirs)
       message(FATAL_ERROR "Failed to find ${fpath}")
     endif()
   endforeach()
+  add_custom_target(abilib_headers DEPENDS ${LIBCXX_CXX_ABI_DEPS})
+  set(LIBCXX_CXX_ABI_DEPS abilib_headers)
   include_directories("${CMAKE_BINARY_DIR}/include")
-  install(FILES ${LIBCXX_CXX_ABI_DEPS}
+  install(DIRECTORY "${CMAKE_BINARY_DIR}/include/"
     DESTINATION include/c++/v1
+    FILES_MATCHING
+    PATTERN "*"
     )
 endmacro()