Update setup.py

lief-project · May 22, 2021 · ce1d02d · ce1d02d
1 parent 3d4799a
commit ce1d02d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 208 deletions.
diff --git a/api/python/CMakeLists.txt b/api/python/CMakeLists.txt
@@ -17,13 +17,12 @@ macro(ADD_FLAG_IF_SUPPORTED flag name)
   endif()
 endmacro()
 
-set(PYTHON_VERSION "3.5" CACHE STRING "Python Version to use")
-find_package(PythonLibsNew EXACT ${PYTHON_VERSION} MODULE REQUIRED)
+find_package(Python3 COMPONENTS Interpreter Development REQUIRED)
 
-message(STATUS "Python version: ${PYTHON_VERSION}")
-message(STATUS "Python lib:     ${PYTHON_LIBRARY}")
-message(STATUS "Python include: ${PYTHON_INCLUDE_DIR}")
-message(STATUS "Python interpreter: ${PYTHON_EXECUTABLE}")
+message(STATUS "Python version: ${Python3_VERSION}")
+message(STATUS "Python lib:     ${Python3_LIBRARIES}")
+message(STATUS "Python include: ${Python3_INCLUDE_DIRS}")
+message(STATUS "Python interpreter: ${Python3_EXECUTABLE}")
 
 set(PYBIND11_VERSION 2.6.1)
 set(PYBIND11_SHA256 SHA256=e3f9408fca4e8ebf2d22229d5256adb49098073832aad87f3f6078d91a6942b2)
@@ -75,7 +74,9 @@ set(LIEF_PYTHON_HDR
 
 source_group("Header Files" FILES ${LIEF_PYTHON_BASIC_HDR})
 
-add_library(pyLIEF SHARED ${LIEF_PYTHON_SRC} ${LIEF_PYTHON_HDR})
+Python3_add_library(pyLIEF MODULE
+  ${LIEF_PYTHON_SRC} ${LIEF_PYTHON_HDR}
+)
 
 target_include_directories(pyLIEF PUBLIC
   "${CMAKE_CURRENT_SOURCE_DIR}/"

diff --git a/cmake/FindPythonLibsNew.cmake b/cmake/FindPythonLibsNew.cmake
diff --git a/setup.py b/setup.py
@@ -135,7 +135,8 @@ def build_extension(self, ext):
 
         cmake_args += [
             '-DCMAKE_LIBRARY_OUTPUT_DIRECTORY={}'.format(cmake_library_output_directory),
-            '-DPYTHON_EXECUTABLE={}'.format(sys.executable),
+            '-DPython3_ROOT_DIR={}'.format(sys.prefix),
+            '-DPython3_FIND_STRATEGY=LOCATION',
             '-DLIEF_PYTHON_API=on',
         ]
 
@@ -260,7 +261,6 @@ def build_extension(self, ext):
 
         if platform.system() == "Windows":
             build_cmd = ['cmake', '--build', '.', '--target', "lief_samples"] + build_args
-            #log.info(" ".join(build_cmd))
 
             if self.distribution.lief_test:
                 subprocess.check_call(['cmake', '--build', '.', '--target', "lief_samples"] + build_args, cwd=self.build_temp, env=env)
@@ -284,7 +284,7 @@ def build_extension(self, ext):
                     subprocess.check_call(['ninja'], cwd=self.build_temp)
                     subprocess.check_call(['ninja', "check-lief"], cwd=self.build_temp)
                 else:
-                    subprocess.check_call(['ninja', "-v", targets['python_bindings']], cwd=self.build_temp, env=env)
+                    subprocess.check_call(['ninja', targets['python_bindings']], cwd=self.build_temp, env=env)
 
                 if 'sdk' in targets:
                     subprocess.check_call(['ninja', targets['sdk']], cwd=self.build_temp, env=env)