From 4c3376de0ac7860aa45dc14b87cc7adff116c713 Mon Sep 17 00:00:00 2001 From: Chandler Carruth Date: Mon, 16 Jun 2014 15:02:21 +0000 Subject: [PATCH] [cmake] Switch python install to use an 'install(DIRECTORY...)' cmake command instead of a script. In addition to cleaning things up, this allows more easy access to the variables. In the old version, it tried to pass variables as -D flags to cmake, but this didn't actually work. CMake drops all of those arguments on the floor (try passing garbage through them) and just picks up the limited subset of pre-defined macros. So, for example, this fixes the build with LLVM_LIBDIR_SUFFIX=64 which is how I ended up here. =] llvm-svn: 211028 --- lldb/scripts/CMakeLists.txt | 3 ++- lldb/scripts/lldb_python_module.cmake | 14 -------------- 2 files changed, 2 insertions(+), 15 deletions(-) delete mode 100644 lldb/scripts/lldb_python_module.cmake diff --git a/lldb/scripts/CMakeLists.txt b/lldb/scripts/CMakeLists.txt index 68468cde3ece..20d44e0106f7 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 55bb537e1be7..000000000000 --- 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}")