More fixes

Author: kunitoki

CMakeLists.txt

@@ -37,6 +37,7 @@ option (YUP_TARGET_ANDROID_BUILD_GRADLE "When building for Android, build the gr
 option (YUP_ENABLE_PROFILING "Enable the profiling code using Perfetto SDK" OFF)
 option (YUP_ENABLE_COVERAGE "Enable code coverage collection for tests" OFF)
 option (YUP_EXPORT_MODULES "Export the modules to the parent project" ON)
+option (YUP_ENABLE_STATIC_PYTHON_LIBS "Use static Python libraries" OFF)
 option (YUP_BUILD_JAVA_SUPPORT "Build the Java support" OFF)
 option (YUP_BUILD_EXAMPLES "Build the examples" ${PROJECT_IS_TOP_LEVEL})
 option (YUP_BUILD_TESTS "Build the tests" ${PROJECT_IS_TOP_LEVEL})
@@ -49,6 +50,9 @@ if (YUP_EXPORT_MODULES)
     if (YUP_PLATFORM_DESKTOP)
         _yup_message (STATUS "Enabling python module support")
         set (enable_python ON)
+        if (YUP_PLATFORM_LINUX)
+            set (YUP_ENABLE_STATIC_PYTHON_LIBS OFF)
+        endif()
     else()
         _yup_message (STATUS "Disabling python module support")
         set (enable_python OFF)

README.md

@@ -142,7 +142,7 @@ Available recipes:
     ios PLATFORM="OS64"                     # generate and open project for iOS using Xcode
     ios_simulator PLATFORM="SIMULATORARM64" # generate and open project for iOS Simulator macOS using Xcode
     linux PROFILING="OFF"                   # generate project in Linux using Ninja
-    osx PROFILING="OFF"                     # generate and open project in macOS using Xcode
+    mac PROFILING="OFF"                     # generate and open project in macOS using Xcode
     win PROFILING="OFF"                     # generate and open project in Windows using Visual Studio
 ```
 

cmake/platforms/osx/Info.plist cmake/platforms/mac/Info.plistcmake/platforms/osx/Info.plist renamed to cmake/platforms/mac/Info.plist

@@ -114,7 +114,7 @@ endfunction()
 
 #==============================================================================
 
-function (_yup_fetch_python include_dir root_dir)
+function (_yup_fetch_python root_dir use_static_libs)
     if (TARGET Python::Python)
         return()
     endif()
@@ -123,7 +123,7 @@ function (_yup_fetch_python include_dir root_dir)
         set (Python_ROOT_DIR "${root_dir}")
     endif()
 
-    set (Python_USE_STATIC_LIBS TRUE)
+    set (Python_USE_STATIC_LIBS "${use_static_libs}")
     find_package (Python REQUIRED Development Interpreter)
 
 endfunction()

cmake/yup_dependencies.cmake

@@ -523,9 +523,11 @@ function (yup_add_module module_path modules_definitions module_group)
 
     # ==== Fetch Python if needed
     if (module_needs_python)
-        _yup_fetch_python ("${Python_INCLUDE_DIRS}" "${Python_ROOT_DIR}")
+        _yup_fetch_python ("${Python_ROOT_DIR}" "${YUP_ENABLE_STATIC_PYTHON_LIBS}")
         list (APPEND module_libs Python::Python)
-        list (APPEND module_include_paths "${Python_INCLUDE_DIRS}")
+        if (NOT "${Python_INCLUDE_DIRS}" STREQUAL "")
+            list (APPEND module_include_paths "${Python_INCLUDE_DIRS}")
+        endif()
         if (NOT "${Python_LIBRARY_DIRS}" STREQUAL "")
             list (APPEND module_libs_paths "${Python_LIBRARY_DIRS}")
         endif()

cmake/yup_modules.cmake

@@ -22,7 +22,7 @@ test CONFIG="Debug":
   build/tests/{{CONFIG}}/yup_tests --gtest_filter={{gtest_filter}}
 
 [doc("generate and open project in macOS using Xcode")]
-osx PROFILING="OFF":
+mac PROFILING="OFF":
   cmake -G Xcode -B build -DYUP_ENABLE_PROFILING={{PROFILING}}
   -open build/yup.xcodeproj
 
@@ -82,7 +82,9 @@ emscripten_serve:
 
 [working-directory: 'python']
 python_wheel:
-  python -m build --wheel && just python_install
+  python -m build --wheel
+  @just python_install
+  @just python_test
 
 [working-directory: 'python']
 python_install: