[Lldb-commits] [lldb] 02bf563 - Fix swig scripts install target name

[António Afonso via lldb-commits]

Author: António Afonso
Date: 2020-08-21T14:41:52-07:00
New Revision: 02bf5632a94da6c3570df002804f8d3f79c11bfc

URL: https://github.com/llvm/llvm-project/commit/02bf5632a94da6c3570df002804f8d3f79c11bfc
DIFF: https://github.com/llvm/llvm-project/commit/02bf5632a94da6c3570df002804f8d3f79c11bfc.diff

LOG: Fix swig scripts install target name

LLVM install component targets needs to be in the form of: install-{target}[-stripped]

I tested with:
```
cmake ... -DLLVM_ENABLE_PROJECTS="clang;lldb" -DLLVM_DISTRIBUTION_COMPONENTS="lldb;liblldb;lldb-python-scripts;" ...
DESTDIR=... ninja install-distribution
```

@JDevlieghere `finish_swig_python_scripts` is a really weird name for a distribution component, any reason that it has to be this way?

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

Added: 
    

Modified: 
    lldb/bindings/python/CMakeLists.txt

Removed: 
    


################################################################################
diff  --git a/lldb/bindings/python/CMakeLists.txt b/lldb/bindings/python/CMakeLists.txt
index d51730d18be0..b6584e389c83 100644
--- a/lldb/bindings/python/CMakeLists.txt
+++ b/lldb/bindings/python/CMakeLists.txt
@@ -163,17 +163,17 @@ function(finish_swig_python swig_target lldb_python_bindings_dir lldb_python_tar
     string(REPLACE ${CMAKE_CFG_INTDIR} "\$\{CMAKE_INSTALL_CONFIG_NAME\}" LLDB_PYTHON_INSTALL_PATH ${LLDB_PYTHON_INSTALL_PATH})
     string(REPLACE ${CMAKE_CFG_INTDIR} "\$\{CMAKE_INSTALL_CONFIG_NAME\}" lldb_python_target_dir ${lldb_python_target_dir})
   endif()
-  set(swig_scripts_target "${swig_target}_scripts")
-  set(swig_scripts_install_target "${swig_target}_scripts_install")
-  add_custom_target(${swig_scripts_target})
-  add_dependencies(${swig_scripts_target} ${swig_target})
+  set(python_scripts_target "lldb-python-scripts")
+  set(python_scripts_install_target "install-${python_scripts_target}")
+  add_custom_target(${python_scripts_target})
+  add_dependencies(${python_scripts_target} ${swig_target})
   install(DIRECTORY ${lldb_python_target_dir}/../
           DESTINATION ${LLDB_PYTHON_INSTALL_PATH}
-          COMPONENT ${swig_scripts_target})
+          COMPONENT ${python_scripts_target})
   if (NOT LLVM_ENABLE_IDE)
-    add_llvm_install_targets(${swig_scripts_install_target}
-                             COMPONENT ${swig_scripts_target}
-                             DEPENDS ${swig_scripts_target})
+    add_llvm_install_targets(${python_scripts_install_target}
+                             COMPONENT ${python_scripts_target}
+                             DEPENDS ${python_scripts_target})
   endif()
 
   # Add a Post-Build Event to copy the custom Python DLL to the lldb binaries dir so that Windows can find it when launching