[cfe-dev] [PATCH] [libc++, cmake] fix duplicate installation of headers

[Ryuta Suzuki]

I can't commit the change to the repository. Can anyone else do it for us?

the lines I commented out may be unnecessary in the macro which deals with
c++abi headers. Should those lines be deleted?

On Friday, May 23, 2014, İsmail Dönmez <ismail at donmez.ws> wrote:

> This fixes the double-installed headers. Can this be applied please?
>
>
> On Thu, May 22, 2014 at 2:24 AM, Ryuta Suzuki <ryuuta at gmail.com<javascript:_e(%7B%7D,'cvml','ryuuta at gmail.com');>
> > wrote:
>
>> Commenting out the install in "setup_abi_lib" macro worked for me:
>>
>> Index: llvm/projects/libcxx/CMakeLists.txt
>> ===================================================================
>> --- llvm/projects/libcxx/CMakeLists.txt (revision 209334)
>> +++ llvm/projects/libcxx/CMakeLists.txt (working copy)
>> @@ -126,11 +126,11 @@
>>    add_custom_target(abilib_headers DEPENDS ${LIBCXX_CXX_ABI_DEPS})
>>    set(LIBCXX_CXX_ABI_DEPS abilib_headers)
>>    include_directories("${CMAKE_BINARY_DIR}/include")
>> -  install(DIRECTORY "${CMAKE_BINARY_DIR}/include/"
>> -    DESTINATION include/c++/v1
>> -    FILES_MATCHING
>> -    PATTERN "*"
>> -    )
>> +#  install(DIRECTORY "${CMAKE_BINARY_DIR}/include/"
>> +#    DESTINATION include/c++/v1
>> +#    FILES_MATCHING
>> +#    PATTERN "*"
>> +#    )
>>  endmacro()
>>
>>  if ("${LIBCXX_CXX_ABI}" STREQUAL "libstdc++" OR
>>
>>
>>
>> On Wed, May 21, 2014 at 5:22 PM, İsmail Dönmez <ismail at donmez.ws<javascript:_e(%7B%7D,'cvml','ismail at donmez.ws');>
>> > wrote:
>>
>>> Hi,
>>>
>>>
>>> On Mon, May 5, 2014 at 11:14 PM, David Fang <fang at csl.cornell.edu<javascript:_e(%7B%7D,'cvml','fang at csl.cornell.edu');>
>>> > wrote:
>>>
>>>> ping.
>>>>
>>>> Would be helpful if someone cmake-literate could review,
>>>> and if someone could test on !darwin.
>>>>
>>>
>>> Tested this on Linux but I still get duplicated headers installed:
>>>
>>>  [   35s] libcxx.x86_64: W: files-duplicate
>>> /usr/include/c++/v1/c++/v1/__tuple_03 /usr/include/c++/v1/__tuple_03
>>> [   35s] libcxx.x86_64: W: files-duplicate
>>> /usr/include/c++/v1/c++/v1/__split_buffer /usr/include/c++/v1/__split_buffer
>>> [   35s] libcxx.x86_64: W: files-duplicate /usr/include/c++/v1/strstream
>>> /usr/include/c++/v1/c++/v1/strstream
>>> [   35s] libcxx.x86_64: W: files-duplicate
>>> /usr/include/c++/v1/c++/v1/random /usr/include/c++/v1/random
>>> [   35s] libcxx.x86_64: W: files-duplicate /usr/include/c++/v1/cstring
>>> /usr/include/c++/v1/c++/v1/cstring
>>> and a lot more of that.
>>>
>>>
>>> _______________________________________________
>>> cfe-dev mailing list
>>> cfe-dev at cs.uiuc.edu<javascript:_e(%7B%7D,'cvml','cfe-dev at cs.uiuc.edu');>
>>> http://lists.cs.uiuc.edu/mailman/listinfo/cfe-dev
>>>
>>>
>>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20140523/782d2afe/attachment.html>