wip (#630)

* wip

* u

* u

* u

* u

* u

* u

* u

* u

* u

* u

* u

Author: Alex2772

.github/workflows/build.yml

@@ -123,7 +123,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-15]
+        os: [ macos-15 ]
         debug_or_release: [Release]
         shared_or_static: [shared, static]
         generator: ["Ninja"]
@@ -169,15 +169,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [windows-latest, ubuntu-latest, macos-14]
+        os: [windows-latest, ubuntu-latest, macos-15]
         debug_or_release: [Debug, Release]
         shared_or_static: [shared, static]
         arch: [x86_64]
         compiler: ["default", "clang"]
         exclude:
           - os: windows-latest
             compiler: "clang"
-          - os: macos-latest
+          - os: macos-15
             compiler: "clang" # default only
         include:
           - os: windows-latest
@@ -188,7 +188,7 @@ jobs:
             generator: "Ninja"
             additional_cmake_flags: ''
 
-          - os: macos-14
+          - os: macos-15
             generator: "Ninja"
 
           - os: ubuntu-latest
@@ -331,6 +331,10 @@ jobs:
         if: runner.os == 'macOS'
         run: brew install ninja
 
+      - name: Install Windows dependencies
+        if: runner.os == 'Windows'
+        run: choco install innosetup
+
       - name: Download artifact
         uses: actions/download-artifact@v4
         with:
@@ -376,8 +380,16 @@ jobs:
         working-directory: ${{github.workspace}}/build
         run: |
           cmake . -DAUI_APP_PACKAGING=INNOSETUP
+          cmake --build . --config ${{matrix.debug_or_release}}
           cpack -C ${{ matrix.debug_or_release }} . -B artifacts
 
+      - name: Print logs
+        if: failure()
+        shell: bash
+        working-directory: ${{github.workspace}}/build
+        run: |
+          find . -name "*.log" -exec cat {} ";"
+
       - name: Upload test app
         uses: actions/upload-artifact@v4
         with:

aui.boot.cmake

@@ -36,6 +36,7 @@ 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")
@@ -373,7 +374,7 @@ function(_auib_precompiled_archive_name _output_var _project_name)
     set(${_output_var} ${_tmp} PARENT_SCOPE)
 endfunction()
 
-macro(_auib_try_find)
+macro(_auib_try_find AUI_MODULE_NAME)
     set(_mode CONFIG)
     while(TRUE)
         if (AUIB_IMPORT_COMPONENTS)
@@ -440,7 +441,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()
+        _auib_try_find(${AUI_MODULE_NAME})
 
         file(REMOVE ${CMAKE_CURRENT_BINARY_DIR}/binary.tar.gz)
 
@@ -519,7 +520,7 @@ function(_auib_postprocess)
 endfunction()
 
 # TODO add a way to provide file access to the repository
-function(auib_import AUI_MODULE_NAME URL)
+macro(auib_import AUI_MODULE_NAME URL)
     list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/cmake)
     if (AUIB_DISABLE)
         if (AUIB_IMPORT_COMPONENTS)
@@ -710,7 +711,7 @@ function(auib_import AUI_MODULE_NAME URL)
             ROOT_DIR # OPENSSL_ROOT_DIR
             DIR)
         foreach(_v1 ${AUI_MODULE_NAME} ${AUI_MODULE_NAME_UPPER})
-            unset(${_v1}_${_v2} PARENT_SCOPE)
+            unset(${_v1}_${_v2})
             unset(${_v1}_${_v2} CACHE)
         endforeach()
     endforeach()
@@ -720,10 +721,10 @@ function(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} 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}_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_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)
@@ -749,7 +750,7 @@ function(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()
+            _auib_try_find(${AUI_MODULE_NAME})
         endif()
     endif()
 
@@ -1058,7 +1059,7 @@ function(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()
+        _auib_try_find(${AUI_MODULE_NAME})
 
         if (NOT ${AUI_MODULE_NAME}_FOUND)
             # print verbosely find procedure
@@ -1166,7 +1167,7 @@ function(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 ()
-endfunction()
+endmacro()
 
 
 macro(auib_use_system_libs_begin)

aui.crypt/CMakeLists.txt

@@ -16,6 +16,16 @@ target_include_directories(aui.crypt PRIVATE ${OPENSSL_INCLUDE_DIR})
 
 aui_link(aui.crypt PRIVATE OpenSSL::SSL OpenSSL::Crypto)
 
+auib_mark_var_forwardable(OPENSSL_CRYPTO_LIBRARY)
+auib_mark_var_forwardable(OPENSSL_CRYPTO_LIBRARIES)
+auib_mark_var_forwardable(OPENSSL_SSL_LIBRARY)
+auib_mark_var_forwardable(OPENSSL_SSL_LIBRARIES)
+auib_mark_var_forwardable(OPENSSL_VERSION)
+auib_mark_var_forwardable(OPENSSL_LIBRARIES)
+auib_mark_var_forwardable(OPENSSL_FOUND)
+auib_mark_var_forwardable(OPENSSL_INCLUDE_DIR)
+auib_mark_var_forwardable(OPENSSL_ROOT_DIR)
+
 if(WIN32 AND NOT BUILD_SHARED_LIBS)
     aui_link(OpenSSL::Crypto INTERFACE wsock32 ws2_32)
 endif()

cmake/aui.build.android.cmake

@@ -76,9 +76,6 @@ function(_aui_android_app)
     unset(ALL_CMAKE_ARGS)
     foreach(CACHE_VAR ${_forwardable_vars})
         get_property(_type CACHE ${CACHE_VAR} PROPERTY TYPE)
-        if(_type STREQUAL INTERNAL)
-            continue()
-        endif()
         if(NOT _type)
             continue()
         endif()

cmake/aui.build.cmake

@@ -1643,6 +1643,7 @@ macro(aui_app)
         set(_SYSTEM_PROCESSOR ${CMAKE_SYSTEM_PROCESSOR})
         set(CMAKE_SYSTEM_PROCESSOR ${_SYSTEM_PROCESSOR})
         #include(BundleUtilities)
+        auib_use_system_libs_begin()
         include(FindXCTest)
         if (CMAKE_TOOLCHAIN_FILE)
             get_filename_component(CMAKE_TOOLCHAIN_FILE ${CMAKE_TOOLCHAIN_FILE} ABSOLUTE)
@@ -1661,6 +1662,8 @@ macro(aui_app)
         find_library(CFNETWORK CFNetwork REQUIRED)
         find_library(SYSTEMCONFIGURATION SystemConfiguration REQUIRED)
 
+        auib_use_system_libs_end()
+
         # link the frameworks located above
         target_link_libraries(${APP_TARGET}
                 PRIVATE

cmake/aui.build.ios.cmake

@@ -33,9 +33,6 @@ function(_aui_ios_app)
     unset(ALL_CMAKE_ARGS)
     foreach(CACHE_VAR ${_forwardable_vars})
         get_property(_type CACHE ${CACHE_VAR} PROPERTY TYPE)
-        if(_type STREQUAL INTERNAL)
-            continue()
-        endif()
         if(NOT _type)
             continue()
         endif()