diff options
| -rw-r--r-- | lldb/scripts/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | lldb/scripts/lldb_python_module.cmake | 14 |
2 files changed, 2 insertions, 15 deletions
diff --git a/lldb/scripts/CMakeLists.txt b/lldb/scripts/CMakeLists.txt index 68468cde3ec..20d44e0106f 100644 --- a/lldb/scripts/CMakeLists.txt +++ b/lldb/scripts/CMakeLists.txt @@ -19,7 +19,8 @@ ADD_CUSTOM_TARGET(swig_wrapper ALL echo -n # Install the LLDB python module on all operating systems (except Windows) if (NOT CMAKE_SYSTEM_NAME MATCHES "Windows") - install(SCRIPT lldb_python_module.cmake -DCMAKE_INSTALL_PREFIX=\"${CMAKE_INSTALL_PREFIX}\" -DCMAKE_BUILD_DIR=\"${CMAKE_BUILD_DIR}\") + install(DIRECTORY ${CMAKE_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR} + DESTINATION lib${LLVM_LIBDIR_SUFFIX}) endif() # build Python modules diff --git a/lldb/scripts/lldb_python_module.cmake b/lldb/scripts/lldb_python_module.cmake deleted file mode 100644 index 55bb537e1be..00000000000 --- a/lldb/scripts/lldb_python_module.cmake +++ /dev/null @@ -1,14 +0,0 @@ -# This CMake script installs the LLDB python module from the build directory -# to the install directory. - -# FIXME: if a non-standard version of python is requested, the cmake macro -# below will need Python_ADDITIONAL_VERSIONS set in order to find it. -include(FindPythonInterp) - -SET(PYTHON_DIRECTORY python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}) - -SET(lldb_module_src ${CMAKE_CURRENT_BINARY_DIR}/lib/${PYTHON_DIRECTORY}) -SET(lldb_module_dest "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib") - -MESSAGE(STATUS "Installing LLDB python module from: ${lldb_module_src} to ${lldb_module_dest}") -FILE(COPY "${lldb_module_src}" DESTINATION "${lldb_module_dest}") |
