summaryrefslogtreecommitdiffstats
path: root/lldb
diff options
context:
space:
mode:
Diffstat (limited to 'lldb')
-rw-r--r--lldb/CMakeLists.txt17
-rw-r--r--lldb/scripts/CMakeLists.txt3
2 files changed, 19 insertions, 1 deletions
diff --git a/lldb/CMakeLists.txt b/lldb/CMakeLists.txt
index 65c5b2ab968..28c988e034c 100644
--- a/lldb/CMakeLists.txt
+++ b/lldb/CMakeLists.txt
@@ -137,6 +137,23 @@ if (NOT LLDB_DISABLE_PYTHON)
endif()
endif()
find_package(PythonLibs REQUIRED)
+ # PYTHON_LIBRARIES is now a list in the form (debug DebugPath optimized OptimizedPath)
+ # So we need to parse it to get the path to the respective installations.
+ list(FIND PYTHON_LIBRARIES optimized PYTHON_OPTIMIZED_INDEX)
+ list(FIND PYTHON_LIBRARIES debug PYTHON_DEBUG_INDEX)
+ if (NOT ${PYTHON_OPTIMIZED_INDEX} EQUAL -1)
+ MATH(EXPR PYTHON_OPTIMIZED_INDEX "${PYTHON_OPTIMIZED_INDEX}+1")
+ list(GET PYTHON_LIBRARIES ${PYTHON_OPTIMIZED_INDEX} PYTHON_RELEASE_LIBRARY)
+ endif()
+ if (NOT ${PYTHON_DEBUG_INDEX} EQUAL -1)
+ MATH(EXPR PYTHON_DEBUG_INDEX "${PYTHON_DEBUG_INDEX}+1")
+ list(GET PYTHON_LIBRARIES ${PYTHON_DEBUG_INDEX} PYTHON_DEBUG_LIBRARY)
+ endif()
+ if (CMAKE_BUILD_TYPE STREQUAL "Debug")
+ set(PYTHON_LIBRARY ${PYTHON_DEBUG_LIBRARY})
+ else()
+ set(PYTHON_LIBRARY ${PYTHON_RELEASE_LIBRARY})
+ endif()
include_directories(${PYTHON_INCLUDE_DIRS})
endif()
diff --git a/lldb/scripts/CMakeLists.txt b/lldb/scripts/CMakeLists.txt
index b0023968078..58527a87837 100644
--- a/lldb/scripts/CMakeLists.txt
+++ b/lldb/scripts/CMakeLists.txt
@@ -3,7 +3,8 @@ set(LLVM_NO_RTTI 1)
file(GLOB SWIG_INPUTS Python/interface/*.i)
if (CMAKE_SYSTEM_NAME MATCHES "Windows")
- STRING(REGEX REPLACE ".lib" ".dll" PYTHON_DLL ${PYTHON_LIBRARY})
+ STRING(REGEX REPLACE "[.]lib" ".dll" PYTHON_DLL ${PYTHON_LIBRARY})
+ message("Copying ${PYTHON_DLL} to ${CMAKE_BINARY_DIR}/bin")
file(COPY ${PYTHON_DLL} DESTINATION ${CMAKE_BINARY_DIR}/bin)
endif ()
OpenPOWER on IntegriCloud