[Lldb-commits] [lldb] r216392 - Fix the Windows build by removing the unused lldb_python_module.cmake inclusion from CMakeLists.

Deepak Panickal deepak at codeplay.com
Mon Aug 25 11:16:22 PDT 2014


Author: panickal
Date: Mon Aug 25 13:16:22 2014
New Revision: 216392

URL: http://llvm.org/viewvc/llvm-project?rev=216392&view=rev
Log:
Fix the Windows build by removing the unused lldb_python_module.cmake inclusion from CMakeLists.

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=216392&r1=216391&r2=216392&view=diff
==============================================================================
--- lldb/trunk/scripts/CMakeLists.txt (original)
+++ lldb/trunk/scripts/CMakeLists.txt Mon Aug 25 13:16:22 2014
@@ -16,8 +16,11 @@ if ( LLDB_ENABLE_PYTHON_SCRIPTS_SWIG_API
 		DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/LLDBWrapPython.cpp
 		)
 
-	# Install the LLDB python module on all operating systems
-	install(SCRIPT lldb_python_module.cmake -DCMAKE_INSTALL_PREFIX=\"${CMAKE_INSTALL_PREFIX}\" -DCMAKE_BUILD_DIR=\"${CMAKE_BUILD_DIR}\")
+	# Install the LLDB python module on all operating systems (except Windows)
+	if (NOT CMAKE_SYSTEM_NAME MATCHES "Windows")
+	  install(DIRECTORY ${CMAKE_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}
+		DESTINATION lib${LLVM_LIBDIR_SUFFIX})
+	endif()
 else ()
 	add_custom_command(
 	  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/LLDBWrapPython.cpp
@@ -42,4 +45,4 @@ else ()
 endif ()
 
 # build Python modules
-add_subdirectory(Python/modules)
\ No newline at end of file
+add_subdirectory(Python/modules)





More information about the lldb-commits mailing list