<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Fri, Apr 29, 2016 at 4:17 PM, Chris Bieneman via cfe-commits <span dir="ltr"><<a href="mailto:cfe-commits@lists.llvm.org" target="_blank">cfe-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: cbieneman<br>
Date: Fri Apr 29 17:17:15 2016<br>
New Revision: 268124<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=268124&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=268124&view=rev</a><br>
Log:<br>
[CMake] Create a separate install target for libcxx headers<br>
<br>
This change doesn't impact the behavior of the install-libcxx target which installs whichever libcxx components you build, it just adds a separate target to just install the headers.<br>
<br>
Modified:<br>
    libcxx/trunk/include/CMakeLists.txt<br>
    libcxx/trunk/lib/CMakeLists.txt<br>
<br>
Modified: libcxx/trunk/include/CMakeLists.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/CMakeLists.txt?rev=268124&r1=268123&r2=268124&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/CMakeLists.txt?rev=268124&r1=268123&r2=268124&view=diff</a><br>
==============================================================================<br>
--- libcxx/trunk/include/CMakeLists.txt (original)<br>
+++ libcxx/trunk/include/CMakeLists.txt Fri Apr 29 17:17:15 2016<br>
@@ -19,7 +19,7 @@ file(COPY .<br>
 if (LIBCXX_INSTALL_HEADERS)<br>
   install(DIRECTORY .<br>
     DESTINATION include/c++/v1<br>
-    COMPONENT libcxx<br>
+    COMPONENT libcxx-headers<br>
     FILES_MATCHING<br>
     ${LIBCXX_HEADER_PATTERN}<br>
     PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ<br>
@@ -46,7 +46,17 @@ if (LIBCXX_INSTALL_HEADERS)<br>
       DESTINATION include/c++/v1<br>
       PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ<br>
       RENAME __config<br>
-      COMPONENT libcxx)<br>
+      COMPONENT libcxx-headers)<br>
+  endif()<br>
+<br>
+  if (NOT CMAKE_CONFIGURATION_TYPES)<br>
+    # this target is just needed as a placeholder for the distribution target<br>
+    add_custom_target(libcxx-headers)<br>
+    add_custom_target(install-libcxx-headers<br>
+                      DEPENDS ${name} libcxx-headers<br></blockquote><div><br></div><div>What's `${name}` ?</div><div><br></div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
+                      COMMAND "${CMAKE_COMMAND}"<br>
+                              -DCMAKE_INSTALL_COMPONENT=libcxx-headers<br>
+                              -P "${CMAKE_BINARY_DIR}/cmake_install.cmake")<br>
   endif()<br>
<br>
 endif()<br>
<br>
Modified: libcxx/trunk/lib/CMakeLists.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/libcxx/trunk/lib/CMakeLists.txt?rev=268124&r1=268123&r2=268124&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/libcxx/trunk/lib/CMakeLists.txt?rev=268124&r1=268123&r2=268124&view=diff</a><br>
==============================================================================<br>
--- libcxx/trunk/lib/CMakeLists.txt (original)<br>
+++ libcxx/trunk/lib/CMakeLists.txt Fri Apr 29 17:17:15 2016<br>
@@ -180,8 +180,11 @@ if (NOT CMAKE_CONFIGURATION_TYPES AND (L<br>
     if(LIBCXX_INSTALL_LIBRARY)<br>
       set(deps DEPENDS cxx)<br>
     endif()<br>
+    if(LIBCXX_INSTALL_HEADERS)<br>
+      set(deps DEPENDS install-libcxx-headers)<br>
+    endif()<br>
     add_custom_target(install-libcxx<br>
-                      ${deps}<br>
+                      ${deps}<br>
                       COMMAND "${CMAKE_COMMAND}"<br>
                       -DCMAKE_INSTALL_COMPONENT=libcxx<br>
                       -P "${LIBCXX_BINARY_DIR}/cmake_install.cmake")<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@lists.llvm.org">cfe-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits</a><br>
</blockquote></div><br></div></div>