[PATCH] D67781: Revert "Fix swig python package path"

Haibo Huang via Phabricator via llvm-commits llvm-commits at lists.llvm.org
Thu Sep 19 17:48:01 PDT 2019


This revision was not accepted when it landed; it landed in state "Needs Review".
This revision was automatically updated to reflect the committed changes.
Closed by commit rL372364: Revert "Fix swig python package path" (authored by hhb, committed by ).
Herald added a project: LLVM.
Herald added a subscriber: llvm-commits.

Changed prior to commit:
  https://reviews.llvm.org/D67781?vs=220927&id=220928#toc

Repository:
  rL LLVM

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D67781/new/

https://reviews.llvm.org/D67781

Files:
  lldb/trunk/scripts/CMakeLists.txt


Index: lldb/trunk/scripts/CMakeLists.txt
===================================================================
--- lldb/trunk/scripts/CMakeLists.txt
+++ lldb/trunk/scripts/CMakeLists.txt
@@ -42,15 +42,13 @@
 )
 
 if(NOT LLDB_BUILD_FRAMEWORK)
-  # The path here should match the result of python function
-  # distutils.sysconfig.get_python_lib().
-  if(CMAKE_HOST_SYSTEM_NAME MATCHES "Windows")
-    set(swig_python_subdir Lib/site-packages)
+  if(CMAKE_SYSTEM_NAME MATCHES "Windows")
+    set(swig_python_subdir site-packages)
   else()
-    set(swig_python_subdir lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR})
+    set(swig_python_subdir python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR})
   endif()
 
-  set(SWIG_PYTHON_DIR ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${swig_python_subdir})
+  set(SWIG_PYTHON_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/${swig_python_subdir})
   set(SWIG_INSTALL_DIR lib${LLVM_LIBDIR_SUFFIX})
 
   # Install the LLDB python module


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D67781.220928.patch
Type: text/x-patch
Size: 969 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190920/9c62534c/attachment.bin>


More information about the llvm-commits mailing list