[Lldb-commits] [lldb] r226683 - Revert "Some fixes for linking Python on Windows."

[Zachary Turner]

Author: zturner
Date: Wed Jan 21 12:30:40 2015
New Revision: 226683

URL: http://llvm.org/viewvc/llvm-project?rev=226683&view=rev
Log:
Revert "Some fixes for linking Python on Windows."

This reverts commit r226679.  For some reason it was
not generating the same behavior as manually specifying
the include dir, library path, and exe path, and it was
causing the test suite to fail to run.

Modified:
    lldb/trunk/CMakeLists.txt
    lldb/trunk/scripts/CMakeLists.txt

Modified: lldb/trunk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/CMakeLists.txt?rev=226683&r1=226682&r2=226683&view=diff
==============================================================================
--- lldb/trunk/CMakeLists.txt (original)
+++ lldb/trunk/CMakeLists.txt Wed Jan 21 12:30:40 2015
@@ -137,23 +137,6 @@ 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()
 

Modified: lldb/trunk/scripts/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/scripts/CMakeLists.txt?rev=226683&r1=226682&r2=226683&view=diff
==============================================================================
--- lldb/trunk/scripts/CMakeLists.txt (original)
+++ lldb/trunk/scripts/CMakeLists.txt Wed Jan 21 12:30:40 2015
@@ -3,8 +3,7 @@ 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})
-    message("Copying ${PYTHON_DLL} to ${CMAKE_BINARY_DIR}/bin")
+    STRING(REGEX REPLACE ".lib" ".dll" PYTHON_DLL ${PYTHON_LIBRARY})
     file(COPY ${PYTHON_DLL} DESTINATION ${CMAKE_BINARY_DIR}/bin)
 endif ()