[libcxx] r343753 - [CMake] Use just basename when copying C++ ABI headers

Petr Hosek phosek at chromium.org
Wed Oct 3 22:38:53 PDT 2018


Author: phosek
Date: Wed Oct  3 22:38:53 2018
New Revision: 343753

URL: http://llvm.org/viewvc/llvm-project?rev=343753&view=rev
Log:
[CMake] Use just basename when copying C++ ABI headers

This avoids duplicate directories when the filename includes path.

Fixes PR39145

Differential Revision: https://reviews.llvm.org/D52762

Modified:
    libcxx/trunk/cmake/Modules/HandleLibCXXABI.cmake

Modified: libcxx/trunk/cmake/Modules/HandleLibCXXABI.cmake
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/cmake/Modules/HandleLibCXXABI.cmake?rev=343753&r1=343752&r2=343753&view=diff
==============================================================================
--- libcxx/trunk/cmake/Modules/HandleLibCXXABI.cmake (original)
+++ libcxx/trunk/cmake/Modules/HandleLibCXXABI.cmake Wed Oct  3 22:38:53 2018
@@ -41,7 +41,7 @@ macro(setup_abi_lib abidefines abilib ab
         get_filename_component(ifile ${fpath} NAME)
         set(src ${incpath}/${fpath})
 
-        set(dst ${LIBCXX_BINARY_INCLUDE_DIR}/${dstdir}/${fpath})
+        set(dst ${LIBCXX_BINARY_INCLUDE_DIR}/${dstdir}/${ifile})
         add_custom_command(OUTPUT ${dst}
             DEPENDS ${src}
             COMMAND ${CMAKE_COMMAND} -E copy_if_different ${src} ${dst}




More information about the libcxx-commits mailing list