[libcxx] r251065 - Dont required CMake 3 to install a linker script

[Hahnfeld, Jonas via cfe-commits]

Hi,

thanks for the attempt to fix this, but this isn't working for in-tree builds 
of libcxx:
CMake Error at projects/libcxx/lib/cmake_install.cmake:56 (FILE):
  file INSTALL cannot find
  "<<<BUILD>>>/projects/libcxx/lib/libc++.so"

It is located at <<<BUILD>>>/lib/libc++.so. CMake version is 2.8.12.2 which 
should be the minimum required version when building all LLVM projects.

Cheers,
Jonas

> -----Original Message-----
> From: cfe-commits [mailto:cfe-commits-bounces at lists.llvm.org] On Behalf
> Of Eric Fiselier via cfe-commits
> Sent: Thursday, October 22, 2015 11:24 PM
> To: cfe-commits at lists.llvm.org
> Subject: [libcxx] r251065 - Dont required CMake 3 to install a linker script
>
> Author: ericwf
> Date: Thu Oct 22 16:24:01 2015
> New Revision: 251065
>
> URL: http://llvm.org/viewvc/llvm-project?rev=251065&view=rev
> Log:
> Dont required CMake 3 to install a linker script
>
> Modified:
>     libcxx/trunk/lib/CMakeLists.txt
>
> Modified: libcxx/trunk/lib/CMakeLists.txt
> URL: http://llvm.org/viewvc/llvm-
> project/libcxx/trunk/lib/CMakeLists.txt?rev=251065&r1=251064&r2=251065&
> view=diff
> ==========================================================
> ====================
> --- libcxx/trunk/lib/CMakeLists.txt (original)
> +++ libcxx/trunk/lib/CMakeLists.txt Thu Oct 22 16:24:01 2015
> @@ -154,7 +154,6 @@ if (LIBCXX_ENABLE_ABI_LINKER_SCRIPT)
>    )
>  endif()
>
> -
>  if (LIBCXX_INSTALL_LIBRARY)
>    install(TARGETS cxx
>      LIBRARY DESTINATION lib${LIBCXX_LIBDIR_SUFFIX} COMPONENT libcxx
> @@ -163,7 +162,9 @@ if (LIBCXX_INSTALL_LIBRARY)
>    # NOTE: This install command must go after the cxx install command
> otherwise
>    # it will not be executed after the library symlinks are installed.
>    if (LIBCXX_ENABLE_ABI_LINKER_SCRIPT)
> -    install(FILES "$<TARGET_LINKER_FILE:cxx>"
> +    # Replace the libc++ filename with $<TARGET_LINKER_FILE:cxx>
> +    # after we required CMake 3.0.
> +    install(FILES
> "${CMAKE_CURRENT_BINARY_DIR}/libc++${CMAKE_SHARED_LIBRARY_SUFF
> IX}"
>        DESTINATION lib${LIBCXX_LIBDIR_SUFFIX}
>        COMPONENT libcxx)
>    endif()
>
>
> _______________________________________________
> cfe-commits mailing list
> cfe-commits at lists.llvm.org
> http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/pkcs7-signature
Size: 5868 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20151023/ffe9afb6/attachment-0001.bin>