LineageOS/android_external_libcxx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[CMake] Rename cxx_headers back to cxx-headers.

Browse Source 
r334477 renamed the cxx-headers target to cxx_headers, but various
pieces sort-of expect the target names to match the component (e.g.,
LLVM_DISTRIBUTION_COMPONENTS in the various bootstrap caches, which, via
some magic foreign to me, seems to expect cxx-headers,
install-cxx-headers, and install-cxx-headers-stripped to exist.)

Revert back to cxx-headers.

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

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@335899 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Ahmed Bougacha
2018-06-28 18:35:35 +00:00
parent 4d66f0966a
commit 92f1507ade
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/CMakeLists.txt
View File

@@ -228,11 +228,11 @@ if(NOT LIBCXX_USING_INSTALLED_LLVM AND LLVM_BINARY_DIR)
list(APPEND out_files ${dst}) list(APPEND out_files ${dst})
endif() endif()
add_custom_target(cxx_headers ALL DEPENDS ${out_files} ${LIBCXX_CXX_ABI_HEADER_TARGET}) add_custom_target(cxx-headers ALL DEPENDS ${out_files} ${LIBCXX_CXX_ABI_HEADER_TARGET})
else() else()
add_custom_target(cxx_headers) add_custom_target(cxx-headers)
endif() endif()
set_target_properties(cxx_headers PROPERTIES FOLDER "Misc") set_target_properties(cxx-headers PROPERTIES FOLDER "Misc")
if (LIBCXX_INSTALL_HEADERS) if (LIBCXX_INSTALL_HEADERS)
foreach(file ${files}) foreach(file ${files})
@@ -255,7 +255,7 @@ if (LIBCXX_INSTALL_HEADERS)
if (NOT CMAKE_CONFIGURATION_TYPES) if (NOT CMAKE_CONFIGURATION_TYPES)
add_custom_target(install-cxx-headers add_custom_target(install-cxx-headers
DEPENDS cxx_headers ${generated_config_deps} DEPENDS cxx-headers ${generated_config_deps}
COMMAND "${CMAKE_COMMAND}" COMMAND "${CMAKE_COMMAND}"
-DCMAKE_INSTALL_COMPONENT=cxx-headers -DCMAKE_INSTALL_COMPONENT=cxx-headers
-P "${CMAKE_BINARY_DIR}/cmake_install.cmake") -P "${CMAKE_BINARY_DIR}/cmake_install.cmake")

2
lib/CMakeLists.txt
View File

@@ -286,7 +286,7 @@ if (LIBCXX_ENABLE_STATIC)
endif() endif()
# Add a meta-target for both libraries. # Add a meta-target for both libraries.
add_custom_target(cxx DEPENDS cxx_headers ${LIBCXX_TARGETS}) add_custom_target(cxx DEPENDS cxx-headers ${LIBCXX_TARGETS})
if (LIBCXX_ENABLE_EXPERIMENTAL_LIBRARY) if (LIBCXX_ENABLE_EXPERIMENTAL_LIBRARY)
file(GLOB LIBCXX_EXPERIMENTAL_SOURCES ../src/experimental/*.cpp) file(GLOB LIBCXX_EXPERIMENTAL_SOURCES ../src/experimental/*.cpp)