[Lldb-commits] [PATCH] D41099: [lldb] Switch to add_llvm_install_targets

[Shoaib Meenai via Phabricator via lldb-commits]

smeenai created this revision.
Herald added a subscriber: mgorny.

This adds the install-*-stripped targets to LLDB, which are required for
the install-distribution-stripped option. We also need to create some
install-*-stripped targets manually, which are modeled after their
corresponding install-* targets.


https://reviews.llvm.org/D41099

Files:
  cmake/modules/AddLLDB.cmake


Index: cmake/modules/AddLLDB.cmake
===================================================================
--- cmake/modules/AddLLDB.cmake
+++ cmake/modules/AddLLDB.cmake
@@ -66,11 +66,8 @@
           ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX})
       endif()
       if (NOT CMAKE_CONFIGURATION_TYPES)
-        add_custom_target(install-${name}
-                          DEPENDS ${name}
-                          COMMAND "${CMAKE_COMMAND}"
-                                  -DCMAKE_INSTALL_COMPONENT=${name}
-                                  -P "${CMAKE_BINARY_DIR}/cmake_install.cmake")
+        add_llvm_install_targets(install-${name}
+                                 DEPENDS ${name})
       endif()
     endif()
   endif()
@@ -121,6 +118,8 @@
       if(ARG_GENERATE_INSTALL)
         add_custom_target(install-${name} DEPENDS ${name})
         add_dependencies(install-liblldb ${name})
+        add_custom_target(install-${name}-stripped DEPENDS ${name})
+        add_dependencies(install-liblldb-stripped ${name})
       endif()
     else()
       set_target_properties(${name} PROPERTIES
@@ -134,11 +133,8 @@
           COMPONENT ${name}
           RUNTIME DESTINATION bin)
     if (NOT CMAKE_CONFIGURATION_TYPES)
-      add_custom_target(install-${name}
-                        DEPENDS ${name}
-                        COMMAND "${CMAKE_COMMAND}"
-                                -DCMAKE_INSTALL_COMPONENT=${name}
-                                -P "${CMAKE_BINARY_DIR}/cmake_install.cmake")
+      add_llvm_install_targets(install-${name}
+                               DEPENDS ${name})
     endif()
   endif()
 



Index: cmake/modules/AddLLDB.cmake
===================================================================
--- cmake/modules/AddLLDB.cmake
+++ cmake/modules/AddLLDB.cmake
@@ -66,11 +66,8 @@
           ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX})
       endif()
       if (NOT CMAKE_CONFIGURATION_TYPES)
-        add_custom_target(install-${name}
-                          DEPENDS ${name}
-                          COMMAND "${CMAKE_COMMAND}"
-                                  -DCMAKE_INSTALL_COMPONENT=${name}
-                                  -P "${CMAKE_BINARY_DIR}/cmake_install.cmake")
+        add_llvm_install_targets(install-${name}
+                                 DEPENDS ${name})
       endif()
     endif()
   endif()
@@ -121,6 +118,8 @@
       if(ARG_GENERATE_INSTALL)
         add_custom_target(install-${name} DEPENDS ${name})
         add_dependencies(install-liblldb ${name})
+        add_custom_target(install-${name}-stripped DEPENDS ${name})
+        add_dependencies(install-liblldb-stripped ${name})
       endif()
     else()
       set_target_properties(${name} PROPERTIES
@@ -134,11 +133,8 @@
           COMPONENT ${name}
           RUNTIME DESTINATION bin)
     if (NOT CMAKE_CONFIGURATION_TYPES)
-      add_custom_target(install-${name}
-                        DEPENDS ${name}
-                        COMMAND "${CMAKE_COMMAND}"
-                                -DCMAKE_INSTALL_COMPONENT=${name}
-                                -P "${CMAKE_BINARY_DIR}/cmake_install.cmake")
+      add_llvm_install_targets(install-${name}
+                               DEPENDS ${name})
     endif()
   endif()
 

_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits