diff --git a/cmake/PybindModuleCreation.cmake b/cmake/PybindModuleCreation.cmake index ab983830a713837fbe199c89480f7489063937e4..32f67e0d969b39197b45392a2e013710c58e2171 100644 --- a/cmake/PybindModuleCreation.cmake +++ b/cmake/PybindModuleCreation.cmake @@ -4,7 +4,7 @@ macro(generate_python_binding ) # Use the New FindPython mode, recommanded. Requires CMake 3.15+ find_package(Python 3.7.0 - COMPONENTS Interpreter Development.Module + COMPONENTS Interpreter Development.Module REQUIRED) set(PYBIND11_FINDPYTHON ON) set(PYBIND_VERSION v2.10.4) @@ -21,11 +21,10 @@ macro(generate_python_binding ) pybind11_add_module(${project} MODULE ${pybind_src_files} "NO_EXTRAS") # NO EXTRA required for pip install target_include_directories(${project} PUBLIC "python_binding" ${pybind11_INCLUDE_DIRECTORIES}) - # Handles Python + pybind11 headers dependencies target_link_libraries(${module_name} PRIVATE - Python::Module + Python::Module PUBLIC pybind11::pybind11 ) diff --git a/setup.py b/setup.py index 0be3bb8f8ae199449f43e50b3b47ff41dcefc9a0..11f07e68902bac747dab656db04b4be5ff92d6ea 100644 --- a/setup.py +++ b/setup.py @@ -46,15 +46,7 @@ class CMakeBuild(build_ext): # Impose to use the executable of the python # used to launch setup.py to setup PythonInterp python_executable = sys.executable - python_include_dirs = sysconfig.get_path('include') - python_library = sysconfig.get_config_var('LIBDIR') - python_prefix = sys.exec_prefix - print(f"python\texecutable\t{python_executable}") - print(f"\t\t\tinclude\tdirs {python_include_dirs}") - print(f"-DPYTHON_INCLUDE_DIRS={sysconfig.get_config_var('INCLUDEPY')}") # this might need to be the subdir - print(f"\t\t\tlibrary\t{python_library}") - print(f"-DPYTHON_LIBRARIES={sysconfig.get_config_var('LIBDEST')}") - print(f"\t\t\tprefix\t{python_prefix}") + print(f"python executable :\t{python_executable}") compile_type = "Debug" install_path = ( os.path.join(sys.prefix, "lib", "libAidge") @@ -66,8 +58,6 @@ class CMakeBuild(build_ext): "cmake", str(cwd), f"-DPYTHON_EXECUTABLE={sys.executable}", - f"-DPYTHON_INCLUDE_DIRS={sysconfig.get_config_var('INCLUDEPY')}", - f"-DPYTHON_LIBRARIES={sysconfig.get_config_var('LIBDEST')}", "-DTEST=OFF", f"-DCMAKE_INSTALL_PREFIX:PATH={install_path}", f"-DCMAKE_BUILD_TYPE={compile_type}",