Skip to content

Commit 56f9e4b

Browse files
committed
More work
1 parent 46a69a5 commit 56f9e4b

File tree

2 files changed

+3
-7
lines changed

2 files changed

+3
-7
lines changed

cmake/yup_dependencies.cmake

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -114,15 +114,11 @@ endfunction()
114114

115115
#==============================================================================
116116

117-
function (_yup_fetch_python root_dir use_static_libs modules)
117+
function (_yup_fetch_python use_static_libs modules)
118118
if (TARGET Python::Python OR TARGET Python::Module)
119119
return()
120120
endif()
121121

122-
if (NOT "${root_dir}" STREQUAL "")
123-
set (Python_ROOT_DIR "${root_dir}")
124-
endif()
125-
126122
set (Python_USE_STATIC_LIBS "${use_static_libs}")
127123
find_package (Python REQUIRED COMPONENTS ${modules})
128124

cmake/yup_modules.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -531,15 +531,15 @@ function (yup_add_module module_path modules_definitions module_group)
531531
list (APPEND module_link_options "-Wl,-weak_reference_mismatches,weak")
532532
endif()
533533
else()
534-
if (DEFINED ENV{CIBW_ENVIRONMENT_LINUX})
534+
if (YUP_PLATFORM_LINUX)
535535
set (python_modules "Interpreter;Development.Module")
536536
else()
537537
set (python_modules "Interpreter;Development")
538538
endif()
539539
list (APPEND module_libs Python::Module)
540540
endif()
541541

542-
_yup_fetch_python ("${Python_ROOT_DIR}" "${YUP_ENABLE_STATIC_PYTHON_LIBS}" "${python_modules}")
542+
_yup_fetch_python ("${YUP_ENABLE_STATIC_PYTHON_LIBS}" "${python_modules}")
543543

544544
if (NOT "${Python_INCLUDE_DIRS}" STREQUAL "")
545545
list (APPEND module_include_paths "${Python_INCLUDE_DIRS}")

0 commit comments

Comments
 (0)