More fixes

Author: kunitoki

cmake/platforms/yup_android.cmake

@@ -54,7 +54,7 @@ function (_yup_android_prepare_gradle)
     file (RELATIVE_PATH YUP_ANDROID_APPLICATION_PATH "${CMAKE_CURRENT_BINARY_DIR}/app" "${YUP_ANDROID_APPLICATION_PATH}")
 
     # Prepare files
-    set (BASE_FILES_PATH "${CMAKE_SOURCE_DIR}/cmake/platforms/android")
+    set (BASE_FILES_PATH "${CMAKE_CURRENT_FUNCTION_LIST_DIR}/android")
     configure_file (${BASE_FILES_PATH}/build.gradle.kts.in ${CMAKE_CURRENT_BINARY_DIR}/build.gradle.kts)
     configure_file (${BASE_FILES_PATH}/settings.gradle.kts.in ${CMAKE_CURRENT_BINARY_DIR}/settings.gradle.kts)
     configure_file (${BASE_FILES_PATH}/app/build.gradle.kts.in ${CMAKE_CURRENT_BINARY_DIR}/app/build.gradle.kts)

cmake/yup.cmake

@@ -74,11 +74,11 @@ function (_yup_setup_platform)
     _yup_message (STATUS "Setting up for ${platform} platform")
     _yup_message (STATUS "Running on cmake ${CMAKE_VERSION}")
 
-    set (YUP_PLATFORM "${platform}" PARENT_SCOPE)
+    set (YUP_PLATFORM "${platform}" CACHE STRING INTERNAL)
 
     foreach (platform_name ${platforms})
         string (TOUPPER "${platform_name}" platform_name_upper)
-        set (YUP_PLATFORM_${platform_name_upper} ON PARENT_SCOPE)
+        set (YUP_PLATFORM_${platform_name_upper} ON CACHE BOOL INTERNAL)
     endforeach()
 
 endfunction()

cmake/yup_standalone.cmake

@@ -36,7 +36,7 @@ function (yup_standalone_app)
     cmake_parse_arguments (YUP_ARG "${options}" "${one_value_args}" "${multi_value_args}" ${ARGN})
 
     _yup_set_default (YUP_ARG_TARGET_CXX_STANDARD 20)
-    _yup_set_default (YUP_ARG_TARGET_ICON "${CMAKE_SOURCE_DIR}/cmake/resources/app-icon.png")
+    _yup_set_default (YUP_ARG_TARGET_ICON "${CMAKE_CURRENT_FUNCTION_LIST_DIR}/resources/app-icon.png")
 
     set (target_name "${YUP_ARG_TARGET_NAME}")
     set (target_version "${YUP_ARG_TARGET_VERSION}")
@@ -125,7 +125,7 @@ function (yup_standalone_app)
     # ==== Per platform configuration
     if (YUP_PLATFORM_APPLE)
         if (NOT "${target_console}" AND NOT "${target_wheel}")
-            _yup_set_default (YUP_ARG_CUSTOM_PLIST "${CMAKE_SOURCE_DIR}/cmake/platforms/${YUP_PLATFORM}/Info.plist")
+            _yup_set_default (YUP_ARG_CUSTOM_PLIST "${CMAKE_CURRENT_FUNCTION_LIST_DIR}/platforms/${YUP_PLATFORM}/Info.plist")
             _yup_valid_identifier_string ("${target_app_identifier}" target_app_identifier)
 
             _yup_message (STATUS "${target_name} - Converting application input icon to apple .icns format")
@@ -164,7 +164,7 @@ function (yup_standalone_app)
             set_target_properties (${target_name} PROPERTIES SUFFIX ".html")
         endif()
 
-        _yup_set_default (YUP_ARG_CUSTOM_SHELL "${CMAKE_SOURCE_DIR}/cmake/platforms/${YUP_PLATFORM}/shell.html")
+        _yup_set_default (YUP_ARG_CUSTOM_SHELL "${CMAKE_CURRENT_FUNCTION_LIST_DIR}/platforms/${YUP_PLATFORM}/shell.html")
         _yup_set_default (YUP_ARG_INITIAL_MEMORY 33554432) # 32mb
         _yup_set_default (YUP_ARG_PTHREAD_POOL_SIZE 8)
 
@@ -209,7 +209,7 @@ function (yup_standalone_app)
         add_custom_command(
             TARGET ${target_name} POST_BUILD
             COMMAND ${CMAKE_COMMAND} -E copy
-                "${CMAKE_SOURCE_DIR}/cmake/platforms/${YUP_PLATFORM}/mini-coi.js"
+                "${CMAKE_CURRENT_FUNCTION_LIST_DIR}/platforms/${YUP_PLATFORM}/mini-coi.js"
                 "${target_copy_dest}/mini-coi.js")
 
     elseif (YUP_PLATFORM_LINUX)

cmake/yup_utilities.cmake

@@ -277,7 +277,7 @@ function (_yup_execute_process_or_fail)
         OUTPUT_QUIET)
 
     if (NOT result EQUAL 0)
-        _yup_join_list_with_separator ("${command}" " " "" "" command_string)
+        _yup_join_list_with_separator ("${ARGN}" " " "" "" command_string)
         message (FATAL_ERROR "Failed to execute command '${command_string}': ${error_message}")
     endif()
 endfunction()