This revision was automatically updated to reflect the committed changes.
Closed by commit rG6a79e083a0d1: [lldb] Add a install target for lldb python on
darwin (authored by hhb).
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D69834/new/
https://reviews.llvm.org/D69834
Files:
lldb/CMakeLists.txt
Index: lldb/CMakeLists.txt
===================================================================
--- lldb/CMakeLists.txt
+++ lldb/CMakeLists.txt
@@ -216,18 +216,21 @@
# Ensure we do the python post-build step when building lldb.
add_dependencies(lldb finish_swig)
- if(NOT LLDB_BUILD_FRAMEWORK)
- # Install the LLDB python module
- add_custom_target(lldb-python-scripts)
- add_dependencies(lldb-python-scripts finish_swig)
- install(DIRECTORY
${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${LLDB_PYTHON_RELATIVE_PATH}/
- DESTINATION ${LLDB_PYTHON_RELATIVE_PATH}
- COMPONENT lldb-python-scripts)
- if (NOT LLVM_ENABLE_IDE)
- add_llvm_install_targets(install-lldb-python-scripts
- COMPONENT lldb-python-scripts
- DEPENDS lldb-python-scripts)
- endif()
+ # Install the LLDB python module
+ if(LLDB_BUILD_FRAMEWORK)
+ set(LLDB_PYTHON_INSTALL_PATH
${LLDB_FRAMEWORK_INSTALL_DIR}/LLDB.framework/Resources/Python)
+ else()
+ set(LLDB_PYTHON_INSTALL_PATH ${LLDB_PYTHON_RELATIVE_PATH})
+ endif()
+ add_custom_target(lldb-python-scripts)
+ add_dependencies(lldb-python-scripts finish_swig)
+ install(DIRECTORY ${lldb_python_build_path}/../
+ DESTINATION ${LLDB_PYTHON_INSTALL_PATH}
+ COMPONENT lldb-python-scripts)
+ if (NOT LLVM_ENABLE_IDE)
+ add_llvm_install_targets(install-lldb-python-scripts
+ COMPONENT lldb-python-scripts
+ DEPENDS lldb-python-scripts)
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
Index: lldb/CMakeLists.txt
===================================================================
--- lldb/CMakeLists.txt
+++ lldb/CMakeLists.txt
@@ -216,18 +216,21 @@
# Ensure we do the python post-build step when building lldb.
add_dependencies(lldb finish_swig)
- if(NOT LLDB_BUILD_FRAMEWORK)
- # Install the LLDB python module
- add_custom_target(lldb-python-scripts)
- add_dependencies(lldb-python-scripts finish_swig)
- install(DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${LLDB_PYTHON_RELATIVE_PATH}/
- DESTINATION ${LLDB_PYTHON_RELATIVE_PATH}
- COMPONENT lldb-python-scripts)
- if (NOT LLVM_ENABLE_IDE)
- add_llvm_install_targets(install-lldb-python-scripts
- COMPONENT lldb-python-scripts
- DEPENDS lldb-python-scripts)
- endif()
+ # Install the LLDB python module
+ if(LLDB_BUILD_FRAMEWORK)
+ set(LLDB_PYTHON_INSTALL_PATH ${LLDB_FRAMEWORK_INSTALL_DIR}/LLDB.framework/Resources/Python)
+ else()
+ set(LLDB_PYTHON_INSTALL_PATH ${LLDB_PYTHON_RELATIVE_PATH})
+ endif()
+ add_custom_target(lldb-python-scripts)
+ add_dependencies(lldb-python-scripts finish_swig)
+ install(DIRECTORY ${lldb_python_build_path}/../
+ DESTINATION ${LLDB_PYTHON_INSTALL_PATH}
+ COMPONENT lldb-python-scripts)
+ if (NOT LLVM_ENABLE_IDE)
+ add_llvm_install_targets(install-lldb-python-scripts
+ COMPONENT lldb-python-scripts
+ DEPENDS lldb-python-scripts)
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
_______________________________________________
lldb-commits mailing list
[email protected]
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
