ab created this revision.
ab added a reviewer: phosek.
Herald added subscribers: ldionne, mgorny.
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)
We're still finding places that need to be changed, so, unless there was a
reason for that change, revert back to cxx-headers (which, anecdotally, matches
"clang-headers" for the clang lib/Headers/)
Otherwise, perhaps we should have target "aliases" (it seems like that's the
reason why there are both *libcxx-headers* and *cxx-headers* variants of a few
targets)
Repository:
rCXX libc++
https://reviews.llvm.org/D48701
Files:
include/CMakeLists.txt
lib/CMakeLists.txt
Index: lib/CMakeLists.txt
===================================================================
--- lib/CMakeLists.txt
+++ lib/CMakeLists.txt
@@ -286,7 +286,7 @@
endif()
# 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)
file(GLOB LIBCXX_EXPERIMENTAL_SOURCES ../src/experimental/*.cpp)
Index: include/CMakeLists.txt
===================================================================
--- include/CMakeLists.txt
+++ include/CMakeLists.txt
@@ -228,11 +228,11 @@
list(APPEND out_files ${dst})
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()
- add_custom_target(cxx_headers)
+ add_custom_target(cxx-headers)
endif()
-set_target_properties(cxx_headers PROPERTIES FOLDER "Misc")
+set_target_properties(cxx-headers PROPERTIES FOLDER "Misc")
if (LIBCXX_INSTALL_HEADERS)
foreach(file ${files})
@@ -255,7 +255,7 @@
if (NOT CMAKE_CONFIGURATION_TYPES)
add_custom_target(install-cxx-headers
- DEPENDS cxx_headers ${generated_config_deps}
+ DEPENDS cxx-headers ${generated_config_deps}
COMMAND "${CMAKE_COMMAND}"
-DCMAKE_INSTALL_COMPONENT=cxx-headers
-P "${CMAKE_BINARY_DIR}/cmake_install.cmake")
Index: lib/CMakeLists.txt
===================================================================
--- lib/CMakeLists.txt
+++ lib/CMakeLists.txt
@@ -286,7 +286,7 @@
endif()
# 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)
file(GLOB LIBCXX_EXPERIMENTAL_SOURCES ../src/experimental/*.cpp)
Index: include/CMakeLists.txt
===================================================================
--- include/CMakeLists.txt
+++ include/CMakeLists.txt
@@ -228,11 +228,11 @@
list(APPEND out_files ${dst})
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()
- add_custom_target(cxx_headers)
+ add_custom_target(cxx-headers)
endif()
-set_target_properties(cxx_headers PROPERTIES FOLDER "Misc")
+set_target_properties(cxx-headers PROPERTIES FOLDER "Misc")
if (LIBCXX_INSTALL_HEADERS)
foreach(file ${files})
@@ -255,7 +255,7 @@
if (NOT CMAKE_CONFIGURATION_TYPES)
add_custom_target(install-cxx-headers
- DEPENDS cxx_headers ${generated_config_deps}
+ DEPENDS cxx-headers ${generated_config_deps}
COMMAND "${CMAKE_COMMAND}"
-DCMAKE_INSTALL_COMPONENT=cxx-headers
-P "${CMAKE_BINARY_DIR}/cmake_install.cmake")
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
