Author: paperchalice Date: 2022-01-15T10:43:05-08:00 New Revision: 62af3eb2599d91c6d6f4f02ccae2d47d106be64e
URL: https://github.com/llvm/llvm-project/commit/62af3eb2599d91c6d6f4f02ccae2d47d106be64e DIFF: https://github.com/llvm/llvm-project/commit/62af3eb2599d91c6d6f4f02ccae2d47d106be64e.diff LOG: [CMake][LLDB] Resolve install conflict when `LLDB_BUILD_FRAMEWORK=ON` Try to fix https://github.com/llvm/llvm-project/issues/108 Install python scripts into canonical resource path Differential revision: https://reviews.llvm.org/D116853 Added: Modified: lldb/bindings/python/CMakeLists.txt Removed: ################################################################################ diff --git a/lldb/bindings/python/CMakeLists.txt b/lldb/bindings/python/CMakeLists.txt index cecf1e0fc095f..82a52da89a7e3 100644 --- a/lldb/bindings/python/CMakeLists.txt +++ b/lldb/bindings/python/CMakeLists.txt @@ -158,7 +158,7 @@ function(finish_swig_python swig_target lldb_python_bindings_dir lldb_python_tar # Install the LLDB python module if(LLDB_BUILD_FRAMEWORK) - set(LLDB_PYTHON_INSTALL_PATH ${LLDB_FRAMEWORK_INSTALL_DIR}/LLDB.framework/Resources/Python) + set(LLDB_PYTHON_INSTALL_PATH ${LLDB_FRAMEWORK_INSTALL_DIR}/LLDB.framework/Versions/${LLDB_FRAMEWORK_VERSION}/Resources/Python) else() set(LLDB_PYTHON_INSTALL_PATH ${LLDB_PYTHON_RELATIVE_PATH}) endif() _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits