[libcxx] r210577 - fixes duplicate header installation

[David Fang]

Ryuta,
 	You're more knowledgable about cmake than I am.  Can you tell what 
is wrong based on Ismail's report?  If we can't figure it out, we'll 
porbably have to revert your patch until we find the right fix.

David

> Hi this is on Linux x86-64, cmake line is:
>
>
> CC=/opt/clang/bin/clang CXX=/opt/clang/bin/clang++ \
> cmake -DLIBCXX_CXX_ABI=libcxxabi
> -DLIBCXX_LIBCXXABI_INCLUDE_PATHS="/usr/include" \
> -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr .
>
> cxxabi.h lives in /usr/include/cxxabi.h
>
>
>
> On Wed, Jun 11, 2014 at 9:29 PM, David Fang <fang at csl.cornell.edu> wrote:
>
>> Hi Ismail,
>>
>>         Can you show us your cmake options? or attach a CMakeCache.txt
>> file?  Where does your cxxabi.h live on your system?  What is your system?
>>
>> David
>>
>>
>> On Wed, 11 Jun 2014, smail Dönmez wrote:
>>
>>  Hi,
>>>
>>> This breaks build:
>>>
>>> Install the project...
>>> -- Install configuration: "Release"
>>> CMake Error at cmake_install.cmake:36 (file):
>>>   file INSTALL cannot find
>>>   "/home/abuild/rpmbuild/BUILD/libcxx/build/include//cxxabi.h"
>>>
>>>
>>>
>>> On Tue, Jun 10, 2014 at 11:26 PM, David Fang <fang at csl.cornell.edu>
>>> wrote:
>>>
>>>  Author: fangism
>>>> Date: Tue Jun 10 15:26:54 2014
>>>> New Revision: 210577
>>>>
>>>> URL: http://llvm.org/viewvc/llvm-project?rev=210577&view=rev
>>>> Log:
>>>> fixes duplicate header installation
>>>> http://llvm.org/bugs/show_bug.cgi?id=18681
>>>> Patch by Ryuta Suzuki <oroppas gmail com>
>>>>
>>>> Modified:
>>>>     libcxx/trunk/CMakeLists.txt
>>>>
>>>> Modified: libcxx/trunk/CMakeLists.txt
>>>> URL:
>>>> http://llvm.org/viewvc/llvm-project/libcxx/trunk/
>>>> CMakeLists.txt?rev=210577&r1=210576&r2=210577&view=diff
>>>>
>>>> ============================================================
>>>> ==================
>>>> --- libcxx/trunk/CMakeLists.txt (original)
>>>> +++ libcxx/trunk/CMakeLists.txt Tue Jun 10 15:26:54 2014
>>>> @@ -123,13 +123,9 @@ 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(DIRECTORY "${CMAKE_BINARY_DIR}/include/"
>>>> +  install(FILES ${LIBCXX_CXX_ABI_DEPS}
>>>>      DESTINATION include/c++/v1
>>>> -    FILES_MATCHING
>>>> -    PATTERN "*"
>>>>      )
>>>>  endmacro()
>>>>
>>>>
>>>>
>>>> _______________________________________________
>>>> cfe-commits mailing list
>>>> cfe-commits at cs.uiuc.edu
>>>> http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
>>>>
>>>>
>>>
>> --
>> David Fang
>> http://www.csl.cornell.edu/~fang/
>>
>

-- 
David Fang
http://www.csl.cornell.edu/~fang/