More tweaks

Author: kunitoki

cmake/yup_dependencies.cmake

@@ -114,8 +114,8 @@ endfunction()
 
 #==============================================================================
 
-function (_yup_fetch_python root_dir use_static_libs)
-    if (TARGET Python::Python)
+function (_yup_fetch_python root_dir use_static_libs modules)
+    if (TARGET Python::Python OR TARGET Python::Module)
         return()
     endif()
 
@@ -124,7 +124,7 @@ function (_yup_fetch_python root_dir use_static_libs)
     endif()
 
     set (Python_USE_STATIC_LIBS "${use_static_libs}")
-    find_package (Python REQUIRED Development Interpreter)
+    find_package (Python COMPONENTS ${modules} REQUIRED)
 
 endfunction()
 

cmake/yup_modules.cmake

@@ -523,13 +523,24 @@ function (yup_add_module module_path modules_definitions module_group)
 
     # ==== Fetch Python if needed
     if (module_needs_python)
-        _yup_fetch_python ("${Python_ROOT_DIR}" "${YUP_ENABLE_STATIC_PYTHON_LIBS}")
+        set (python_modules "")
         if (NOT YUP_BUILD_WHEEL)
+            set (python_modules "Interpreter;Development.Embed")
             list (APPEND module_libs Python::Python)
             if (YUP_PLATFORM_MAC)
                 list (APPEND module_link_options "-Wl,-weak_reference_mismatches,weak")
             endif()
+        else()
+            if (DEFINED ENV{CIBW_ENVIRONMENT_LINUX})
+                set (python_modules "Interpreter;Development.Module")
+            else()
+                set (python_modules "Interpreter;Development")
+            endif()
+            list (APPEND module_libs Python::Module)
         endif()
+
+        _yup_fetch_python ("${Python_ROOT_DIR}" "${YUP_ENABLE_STATIC_PYTHON_LIBS}" "${python_modules}")
+
         if (NOT "${Python_INCLUDE_DIRS}" STREQUAL "")
             list (APPEND module_include_paths "${Python_INCLUDE_DIRS}")
         endif()

python/setup.py

@@ -120,8 +120,12 @@ def build_extension(self, ext):
                 f"-DPython_INCLUDE_DIRS={get_python_includes_path()}",
                 f"-DPython_LIBRARY_DIRS={get_python_lib_path()}"
             ]
-        else:
-            cmake_args += [f"-DPYTHON_EXECUTABLE={sys.executable}"]
+
+        if platform.system() == 'Darwin':
+            cmake_args += [
+                f"-DCMAKE_OSX_ARCHITECTURES:STRING={self.build_osx_architectures}",
+                f"-DCMAKE_OSX_DEPLOYMENT_TARGET:STRING={self.build_osx_deployment_target}"
+            ]
 
         if self.build_for_coverage:
             cmake_args += ["-DYUP_ENABLE_COVERAGE:BOOL=ON"]
@@ -132,12 +136,6 @@ def build_extension(self, ext):
         if self.build_with_lto:
             cmake_args += ["-DYUP_ENABLE_LTO:BOOL=ON"]
 
-        if platform.system() == 'Darwin':
-            cmake_args += [
-                f"-DCMAKE_OSX_ARCHITECTURES:STRING={self.build_osx_architectures}",
-                f"-DCMAKE_OSX_DEPLOYMENT_TARGET:STRING={self.build_osx_deployment_target}"
-            ]
-
         try:
             os.chdir(str(build_temp))
             make_command = ["cmake", str(os.path.join(cwd, ".."))] + cmake_args