[libcxx] r210857 - Revert "fixes duplicate header installation"

David Fang fang at csl.cornell.edu
Thu Jun 12 16:19:55 PDT 2014


Author: fangism
Date: Thu Jun 12 18:19:55 2014
New Revision: 210857

URL: http://llvm.org/viewvc/llvm-project?rev=210857&view=rev
Log:
Revert "fixes duplicate header installation"

This reverts commit 0bd40d6c3da6719fecf77038673d453ff1eab25b.

Modified:
    libcxx/trunk/CMakeLists.txt

Modified: libcxx/trunk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/CMakeLists.txt?rev=210857&r1=210856&r2=210857&view=diff
==============================================================================
--- libcxx/trunk/CMakeLists.txt (original)
+++ libcxx/trunk/CMakeLists.txt Thu Jun 12 18:19:55 2014
@@ -123,9 +123,13 @@ macro(setup_abi_lib abipathvar abidefine
       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()
 





More information about the cfe-commits mailing list