Work on CI builds

Author: emericg

CMakeLists.txt

@@ -305,9 +305,9 @@ if(ENABLE_MBEDTLS)
     add_definitions(-DENABLE_MBEDTLS)
 
     # Using CMake include directory
-    set(ENABLE_TESTING OFF)
-    set(ENABLE_PROGRAMS OFF)
-    set(MBEDTLS_FATAL_WARNINGS OFF)
+    set(ENABLE_TESTING OFF CACHE BOOL "" FORCE)
+    set(ENABLE_PROGRAMS OFF CACHE BOOL "" FORCE)
+    set(MBEDTLS_FATAL_WARNINGS OFF CACHE BOOL "" FORCE)
     add_subdirectory(thirdparty/mbedtls)
     target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE MbedTLS::mbedtls)
 
@@ -328,9 +328,9 @@ add_subdirectory(thirdparty/SingleApplication)
 target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE SingleApplication)
 
 # AppUtils
-set(UTILS_DOCK_ENABLED true)
-set(UTILS_WIFI_ENABLED false)
-set(UTILS_NOTIFICATIONS_ENABLED true)
+set(UTILS_DOCK_ENABLED ON CACHE BOOL "" FORCE)
+set(UTILS_WIFI_ENABLED OFF CACHE BOOL "" FORCE)
+set(UTILS_NOTIFICATIONS_ENABLED ON CACHE BOOL "" FORCE)
 add_subdirectory(thirdparty/AppUtils)
 target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE AppUtils)
 

deploy_linux.sh

@@ -58,7 +58,7 @@ if [[ $use_contribs = true ]] ; then
   export LD_LIBRARY_PATH=$(pwd)/contribs/src/env/linux_x86_64/usr/lib/:$LD_LIBRARY_PATH
 fi
 
-if [[ -v QT_ROOT_DIR ]]; then
+if [[ -v QT_ROOT_DIR ]] ; then
   # cleanup undeployable Qt plugins (present, but missing their own dependencies)
   # only if we are on a GitHub Action server, because this remove the plugins from the Qt directory
   echo '---- Remove undeployable Qt plugins'
@@ -125,7 +125,8 @@ if [[ $create_package = true ]] ; then
   ./contribs/deploy/linuxdeploy-x86_64.AppImage --appdir bin --plugin qt --output appimage
   mv $APP_NAME_LOWERCASE-x86_64.AppImage $APP_NAME-$APP_VERSION-linux64.AppImage
 
-  #echo '---- Installation directory content recap (after linuxdeploy):'
+  echo '---- Installation directory content recap (after linuxdeploy):'
+  find .
   #find bin/
 fi
 

deploy_macos.sh

@@ -57,7 +57,7 @@ if [[ $use_contribs = true ]] ; then
   export LD_LIBRARY_PATH=$(pwd)/contribs/src/env/macOS_x86_64/usr/lib/:$(pwd)/contribs/src/env/macOS_arm64/usr/lib/:$LD_LIBRARY_PATH
 fi
 
-if [[ -v QT_ROOT_DIR ]]; then
+if [[ -n "${QT_ROOT_DIR:-}" ]]; then
   # cleanup undeployable Qt plugins (present, but missing their own dependencies)
   # only if we are on a GitHub Action server, because this remove the plugins from the Qt directory
   echo '---- Remove undeployable Qt plugins'