update aui.toolbox version in android/ios (#633)

* update aui.toolbox version in android/ios

* rollback aui.boot changes

* u

Author: Alex2772

aui.boot.cmake

@@ -36,7 +36,6 @@ define_property(GLOBAL PROPERTY AUIB_FORWARDABLE_VARS
 
 macro(auib_mark_var_forwardable VAR)
     set_property(GLOBAL APPEND PROPERTY AUIB_FORWARDABLE_VARS ${VAR})
-    set(${VAR} "${${VAR}}" CACHE INTERNAL "auib_mark_var_forwardable propagated variable")
 endmacro()
 
 option(AUIB_NO_PRECOMPILED "Forbid usage of precompiled packages")
@@ -374,7 +373,7 @@ function(_auib_precompiled_archive_name _output_var _project_name)
     set(${_output_var} ${_tmp} PARENT_SCOPE)
 endfunction()
 
-macro(_auib_try_find AUI_MODULE_NAME)
+macro(_auib_try_find)
     set(_mode CONFIG)
     while(TRUE)
         if (AUIB_IMPORT_COMPONENTS)
@@ -441,7 +440,7 @@ function(_auib_try_download_precompiled_binary)
         execute_process(COMMAND ${CMAKE_COMMAND} -E tar xzf ${CMAKE_CURRENT_BINARY_DIR}/binary.tar.gz
                 WORKING_DIRECTORY ${DEP_INSTALL_PREFIX})
 
-        _auib_try_find(${AUI_MODULE_NAME})
+        _auib_try_find()
 
         file(REMOVE ${CMAKE_CURRENT_BINARY_DIR}/binary.tar.gz)
 
@@ -520,7 +519,7 @@ function(_auib_postprocess)
 endfunction()
 
 # TODO add a way to provide file access to the repository
-macro(auib_import AUI_MODULE_NAME URL)
+function(auib_import AUI_MODULE_NAME URL)
     list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/cmake)
     if (AUIB_DISABLE)
         if (AUIB_IMPORT_COMPONENTS)
@@ -711,7 +710,7 @@ macro(auib_import AUI_MODULE_NAME URL)
             ROOT_DIR # OPENSSL_ROOT_DIR
             DIR)
         foreach(_v1 ${AUI_MODULE_NAME} ${AUI_MODULE_NAME_UPPER})
-            unset(${_v1}_${_v2})
+            unset(${_v1}_${_v2} PARENT_SCOPE)
             unset(${_v1}_${_v2} CACHE)
         endforeach()
     endforeach()
@@ -721,10 +720,10 @@ macro(auib_import AUI_MODULE_NAME URL)
     set(${AUI_MODULE_NAME}_ROOT_DIR ${DEP_INSTALL_PREFIX} CACHE FILEPATH "Path to ${AUI_MODULE_NAME} provided by AUI.Boot.")
 
     # creating uppercase variables in order to ease the case insensitive checks
-    set(${AUI_MODULE_NAME}_DIR ${DEP_INSTALL_PREFIX} )
-    set(${AUI_MODULE_NAME_UPPER}_DIR ${DEP_INSTALL_PREFIX} )
-    set(${AUI_MODULE_NAME_UPPER}_ROOT ${DEP_INSTALL_PREFIX} )
-    set(${AUI_MODULE_NAME_UPPER}_ROOT_DIR ${DEP_INSTALL_PREFIX} )
+    set(${AUI_MODULE_NAME}_DIR ${DEP_INSTALL_PREFIX} PARENT_SCOPE)
+    set(${AUI_MODULE_NAME_UPPER}_DIR ${DEP_INSTALL_PREFIX} PARENT_SCOPE)
+    set(${AUI_MODULE_NAME_UPPER}_ROOT ${DEP_INSTALL_PREFIX} PARENT_SCOPE)
+    set(${AUI_MODULE_NAME_UPPER}_ROOT_DIR ${DEP_INSTALL_PREFIX} PARENT_SCOPE)
     set(${AUI_MODULE_NAME_UPPER}_ROOT_DIR ${DEP_INSTALL_PREFIX} CACHE FILEPATH "Path to ${AUI_MODULE_NAME} provided by AUI.Boot.")
 
     set(DEP_INSTALLED_FLAG ${DEP_INSTALL_PREFIX}/INSTALLED)
@@ -750,7 +749,7 @@ macro(auib_import AUI_MODULE_NAME URL)
     if (NOT DEP_ADD_SUBDIRECTORY)
         # avoid compilation if we have existing installation
         if (EXISTS ${DEP_INSTALLED_FLAG})
-            _auib_try_find(${AUI_MODULE_NAME})
+            _auib_try_find()
         endif()
     endif()
 
@@ -1059,7 +1058,7 @@ macro(auib_import AUI_MODULE_NAME URL)
         _auib_import_subdirectory(${DEP_SOURCE_DIR} ${AUI_MODULE_NAME})
         message(STATUS "${AUI_MODULE_NAME} imported as a subdirectory: ${DEP_SOURCE_DIR}")
     elseif(NOT ${AUI_MODULE_NAME}_FOUND)
-        _auib_try_find(${AUI_MODULE_NAME})
+        _auib_try_find()
 
         if (NOT ${AUI_MODULE_NAME}_FOUND)
             # print verbosely find procedure
@@ -1167,7 +1166,7 @@ macro(auib_import AUI_MODULE_NAME URL)
             message(WARNING "${AUIB_IMPORT_NAME} You are staying on a branch or did not specify the version control, please specify a tag or hash VERSION!\nSee https://aui-framework.github.io/develop/md_docs_2AUI_01Boot.html#version")
         endif ()
     endif ()
-endmacro()
+endfunction()
 
 
 macro(auib_use_system_libs_begin)

cmake/aui-config.cmake.in

@@ -127,12 +127,10 @@ if (${CMAKE_FIND_PACKAGE_NAME}_views_FOUND AND NOT ANDROID AND NOT IOS)
         find_package(X11 REQUIRED)
         find_package(Fontconfig REQUIRED)
 
-        if (NOT BUILD_SHARED_LIBS)
-            find_package(PkgConfig REQUIRED)
-            pkg_check_modules(DBUS REQUIRED IMPORTED_TARGET dbus-1)
-            pkg_check_modules(GLIB REQUIRED IMPORTED_TARGET glib-2.0)
-            pkg_check_modules(GIO REQUIRED IMPORTED_TARGET gio-2.0)
-        endif()
+        find_package(PkgConfig REQUIRED)
+        pkg_check_modules(DBUS REQUIRED IMPORTED_TARGET dbus-1)
+        pkg_check_modules(GLIB REQUIRED IMPORTED_TARGET glib-2.0)
+        pkg_check_modules(GIO REQUIRED IMPORTED_TARGET gio-2.0)
     endif()
     find_package(OpenGL REQUIRED)
     auib_use_system_libs_end()

cmake/aui.build.cmake

@@ -793,21 +793,6 @@ macro(_aui_find_root)
     endif()
 endmacro()
 
-macro(_aui_try_find_toolbox)
-    _aui_find_root()
-    message(STATUS "AUI_BUILD_AUI_ROOT = ${AUI_BUILD_AUI_ROOT}")
-    find_program(AUI_TOOLBOX_EXE aui.toolbox
-            HINTS ${AUI_BUILD_AUI_ROOT}/bin)
-    if (NOT AUI_TOOLBOX_EXE)
-        file(GLOB_RECURSE AUI_TOOLBOX_EXE ${AUIB_CACHE_DIR}/crosscompile-host/prefix/aui.toolbox.exe ${AUIB_CACHE_DIR}/crosscompile-host/prefix/aui.toolbox)
-
-        if (AUI_TOOLBOX_EXE)
-            list(GET AUI_TOOLBOX_EXE 0 AUI_TOOLBOX_EXE)
-            set(AUI_TOOLBOX_EXE ${AUI_TOOLBOX_EXE} CACHE FILEPATH "aui.toolbox location" FORCE)
-        endif()
-    endif()
-endmacro()
-
 macro(_aui_provide_toolbox_for_host)
     message(STATUS "Compiling aui.toolbox for the host platform")
     set(_workdir ${CMAKE_CURRENT_BINARY_DIR}/aui.toolbox_provider)
@@ -818,7 +803,7 @@ cmake_minimum_required(VERSION 3.16)
 project(aui.toolbox_provider)
 set(CMAKE_CXX_STANDARD 20)
 set(BUILD_SHARED_LIBS FALSE)
-set(AUI_VERSION v7.1.1)
+set(AUI_VERSION v8.0.0-rc.12)
 file(
         DOWNLOAD
         https://raw.githubusercontent.com/aui-framework/aui/${AUI_VERSION}/aui.boot.cmake
@@ -828,6 +813,7 @@ include(${CMAKE_CURRENT_BINARY_DIR}/aui.boot.cmake)
 auib_import(aui https://github.com/aui-framework/aui
             COMPONENTS core toolbox image
             VERSION ${AUI_VERSION})
+_aui_check_toolbox()
 ]])
     set(_build_log ${CMAKE_CURRENT_BINARY_DIR}/aui.toolbox_provider_log.txt)
 
@@ -849,7 +835,7 @@ auib_import(aui https://github.com/aui-framework/aui
                   AUIB_FORCE_PRECOMPILED)
         list(APPEND _forwarded_args "-D${_name}=${${_name}}")
     endforeach()
-    execute_process(COMMAND ${CMAKE_COMMAND} .. -G${_generator} -DAUIB_CACHE_DIR=${AUIB_CACHE_DIR}/crosscompile-host ${_forwarded_args}
+    execute_process(COMMAND ${CMAKE_COMMAND} .. -G${_generator} -DAUIB_CACHE_DIR=${AUIB_CACHE_DIR} ${_forwarded_args}
                     WORKING_DIRECTORY ${_workdir}/b
                     RESULT_VARIABLE _r
                     OUTPUT_FILE ${_build_log}
@@ -863,7 +849,15 @@ auib_import(aui https://github.com/aui-framework/aui
     if (NOT _r STREQUAL 0)
         message(FATAL_ERROR "Unable to build aui.toolbox for the host system (check ${_build_log})")
     endif()
-    _aui_try_find_toolbox()
+
+    file(STRINGS "${_workdir}/b/CMakeCache.txt" _cache_contents)
+    foreach (_line ${_cache_contents})
+        if (_line MATCHES "^AUI_TOOLBOX_EXE:.*=(.*)")
+            set(AUI_TOOLBOX_EXE "${CMAKE_MATCH_1}" CACHE FILEPATH "aui.toolbox" FORCE)
+            break()
+        endif ()
+    endforeach ()
+
     if (NOT AUI_TOOLBOX_EXE)
         message(FATAL_ERROR "Could not provide aui.toolbox (AUI_TOOLBOX_EXE) - giving up")
     endif()
@@ -884,13 +878,23 @@ function(_aui_check_toolbox)
         set(AUI_TOOLBOX_EXE $<TARGET_FILE:aui.toolbox> CACHE FILEPATH "aui.toolbox" FORCE)
         return()
     endif()
-    _aui_try_find_toolbox()
-    if (AUI_TOOLBOX_EXE)
+    _aui_find_root()
+    find_program(AUI_TOOLBOX_EXE
+            NAMES aui.toolbox aui.toolbox.exe
+            PATHS ${AUI_BUILD_AUI_ROOT}/bin
+            NO_DEFAULT_PATH
+            REQUIRED)
+    if (EXISTS ${AUI_TOOLBOX_EXE})
         return()
+    endif ()
+
+    _aui_provide_toolbox_for_host()
+    if (NOT AUI_TOOLBOX_EXE)
+        message(FATAL_ERROR "Can't provide AUI_TOOLBOX_EXE")
     endif()
-    set(AUI_TOOLBOX_EXE ${AUI_DIR}/bin/aui.toolbox CACHE FILEPATH "aui.toolbox" FORCE)
 endfunction()
 
+
 function(aui_compile_assets AUI_MODULE_NAME)
     set(oneValueArgs DIR)
     cmake_parse_arguments(ASSETS "" "${oneValueArgs}" "EXCLUDE" ${ARGN})