From 300da4f9b0cadbc6c4cec4deb777e5ca6bb938a3 Mon Sep 17 00:00:00 2001 From: Eric Fiselier Date: Tue, 23 Sep 2014 14:42:28 +0000 Subject: [PATCH] [libcxx] Fix installation of ABI headers. Fixes PR20936 Summary: I changed the build so that each ABI header gets its own install rule. This gives us the flexibility to install different headers in different directories. This also fixes the problem where libstdc++ bits/
's were not being installed under a bits directory. Test Plan: I tested this patch on linux against libstdc++ and libcxxabi. Reviewers: danalbert, mclow.lists, jroelofs Reviewed By: jroelofs Subscribers: jhunold, cfe-commits Differential Revision: http://reviews.llvm.org/D5454 git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@218309 91177308-0d34-0410-b5e6-96231b3b80d8 --- CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 27a26f8c..12bbb502 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -124,6 +124,10 @@ macro(setup_abi_lib abipathvar abidefines abilibs abifiles abidirs) file(COPY "${incpath}/${fpath}" DESTINATION "${CMAKE_BINARY_DIR}/include/${dstdir}" ) + install(FILES "${CMAKE_BINARY_DIR}/include/${fpath}" + DESTINATION include/c++/v1/${dstdir} + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ + ) list(APPEND abilib_headers "${CMAKE_BINARY_DIR}/include/${fpath}") endif() endforeach() @@ -135,10 +139,6 @@ macro(setup_abi_lib abipathvar abidefines abilibs abifiles abidirs) add_custom_target(LIBCXX_CXX_ABI_DEPS DEPENDS ${abilib_headers}) include_directories("${CMAKE_BINARY_DIR}/include") - install(FILES ${abilib_headers} - DESTINATION include/c++/v1 - PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ - ) endmacro() if ("${LIBCXX_CXX_ABI_LIBNAME}" STREQUAL "libstdc++" OR