[Lldb-commits] [lldb] r211028 - [cmake] Switch python install to use an 'install(DIRECTORY...)' cmake

[Chandler Carruth]

Author: chandlerc
Date: Mon Jun 16 10:02:21 2014
New Revision: 211028

URL: http://llvm.org/viewvc/llvm-project?rev=211028&view=rev
Log:
[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. =]

Removed:
    lldb/trunk/scripts/lldb_python_module.cmake
Modified:
    lldb/trunk/scripts/CMakeLists.txt

Modified: lldb/trunk/scripts/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/scripts/CMakeLists.txt?rev=211028&r1=211027&r2=211028&view=diff
==============================================================================
--- lldb/trunk/scripts/CMakeLists.txt (original)
+++ lldb/trunk/scripts/CMakeLists.txt Mon Jun 16 10:02:21 2014
@@ -19,7 +19,8 @@ ADD_CUSTOM_TARGET(swig_wrapper ALL echo
 
 # 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

Removed: lldb/trunk/scripts/lldb_python_module.cmake
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/scripts/lldb_python_module.cmake?rev=211027&view=auto
==============================================================================
--- lldb/trunk/scripts/lldb_python_module.cmake (original)
+++ lldb/trunk/scripts/lldb_python_module.cmake (removed)
@@ -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}")