flatpak test ok

DeployMacros.cmake

@@ -976,9 +976,13 @@ macro(deploy_target _T)
 
 				set(_flatpak_cmd
 					COMMAND mkdir ${_VERB} -p "${_flatpak_build_dir}"
+					COMMAND "${CMAKE_COMMAND}" -E remove_directory "${_flatpak_build_dir}/.flatpak-builder"
 					COMMAND "${CMAKE_COMMAND}" -DFULLNAME=${_flatpak_app_id} -DFLATPAK_RUNTIME=${_flatpak_runtime} -DFLATPAK_RUNTIME_VER=${_flatpak_runtime_ver} -DFLATPAK_SDK=${_flatpak_sdk} -DTARGET_NAME=${_flatpak_bin_name} -DSOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR} -DFLATPAK_FINISH_ARGS="${_flatpak_finish_args}" -DTEMPLATE=${_modules_dir}/DeployTargetFlatpak.yml.in -DOUTPUT=${_flatpak_manifest} -P ${_modules_dir}/DeployTargetFlatpak.yml.cmake
 					COMMAND mkdir ${_VERB} -p "${_DESTINATION}"
-					COMMAND ${FLATPAK_BUILDER} --install-deps-from=flathub --force-clean --state-dir="${_flatpak_build_dir}/.flatpak-builder" --repo=${_flatpak_repo} "${_flatpak_build_dir}" "${_flatpak_manifest}"
+					COMMAND ${FLATPAK_BUILDER} --force-clean --disable-rofiles-fuse --state-dir="${_flatpak_build_dir}/.flatpak-builder" "${_flatpak_build_dir}" "${_flatpak_manifest}" || true
+					COMMAND flatpak build-finish --share=ipc --socket=fallback-x11 --socket=wayland --socket=pulseaudio --filesystem=home --device=dri "${_flatpak_build_dir}" || true
+					COMMAND sed -i "s/^command=.*/command=${_flatpak_bin_name}/" "${_flatpak_build_dir}/metadata"
+					COMMAND flatpak build-export "${_flatpak_repo}" "${_flatpak_build_dir}"
 					COMMAND flatpak build-bundle "${_flatpak_repo}" "${_DESTINATION}/${_flatpak_name}" "${_flatpak_app_id}"
 					)
 

DeployTargetFlatpak.yml.in

@@ -33,28 +33,9 @@ modules:
     cleanup: []
 
   - name: @TARGET_NAME@
-    buildsystem: cmake-ninja
-    builddir: true
-    config-opts:
-      - -DCMAKE_BUILD_TYPE=Release
-      - -DCMAKE_TOOLCHAIN_FILE=/app/cmake/flatpak-toolchain.cmake
-      - -DBUILD_STAND=OFF
-      - -DBUILD_BSM=OFF
-      - -DBUILD_TSS=OFF
-      - -DPIP_CMG=/app/bin/pip_cmg
-      - -DPIP_RC=/app/bin/pip_rc
-      - -DPIP_TR=/app/bin/pip_tr
-      - -DPIP_DEPLOY_TOOL=/app/bin/deploy_tool
+    buildsystem: simple
     build-commands:
-      - ninja
-      - mkdir -p /app/bin /app/bin/lang /app/bin/uds_scripts
-      - cp -f gui/AWRCANFlasherGUI /app/bin/
-      - cp -f gui/qt5/*.qm /app/bin/lang/ 2>/dev/null || true
-      - cp -rf uds_scripts/* /app/bin/uds_scripts/ 2>/dev/null || true
-    env:
-      CMAKE_PREFIX_PATH: /app
-      PKG_CONFIG_PATH: /app/lib/pkgconfig
-      PATH: /app/bin:/usr/bin:/bin
+      - mkdir -p _build && cd _build && cmake -G Ninja .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=/app/cmake/flatpak-toolchain.cmake -DPIP_DIR=/app -DQAD_DIR=/app -DBUILD_STAND=OFF -DBUILD_BSM=OFF -DBUILD_TSS=OFF -DPIP_CMG=/app/bin/pip_cmg -DPIP_RC=/app/bin/pip_rc -DPIP_TR=/app/bin/pip_tr -DPIP_DEPLOY_TOOL=/app/bin/deploy_tool && ninja && mkdir -p /app/bin /app/bin/lang /app/bin/uds_scripts && cp -f gui/AWRCANFlasherGUI /app/bin/ && cp -f core/awrcanflasher /app/bin/ && cp -f gui/qt5/*.qm /app/bin/lang/ 2>/dev/null || true && cp -rf ../uds_scripts/* /app/bin/uds_scripts/ 2>/dev/null || true
     sources:
       - type: dir
         path: @SOURCE_DIR@/..

SHSTKMacros.cmake

@@ -284,6 +284,8 @@ macro(shstk_set_find_dirs name)
 		link_directories(${CMAKE_PREFIX_PATH}/lib)
 	else()
 		list(APPEND ${name}_BINDIR "${CMAKE_PREFIX_PATH}/bin")
+		list(APPEND ${name}_INCDIR "${CMAKE_PREFIX_PATH}/include/${${name}_lowercase}")
+		list(APPEND ${name}_LIBDIR "${CMAKE_PREFIX_PATH}/lib")
 		if(NOT WIN32)
 			list(APPEND ${name}_INCDIR "/usr/include/${${name}_lowercase}" "/usr/local/include/${${name}_lowercase}")
 			list(APPEND ${name}_LIBDIR "/usr/lib" "/usr/local/lib")

flatpak-toolchain.cmake

@@ -3,20 +3,22 @@
 
 set(CMAKE_SYSTEM_NAME Linux)
 set(CMAKE_SYSTEM_PROCESSOR x86_64)
+set(CMAKE_CROSSCOMPILING FALSE)
 
 # Install prefix inside flatpak sandbox
 set(CMAKE_INSTALL_PREFIX /app CACHE PATH "Install prefix" FORCE)
 set_property(CACHE CMAKE_INSTALL_PREFIX PROPERTY VALUE /app)
 set(INSTALL_DIR /app CACHE PATH "Install dir for cmake modules" FORCE)
 
-# Search paths inside flatpak
-set(CMAKE_PREFIX_PATH /app CACHE PATH "Prefix path" FORCE)
+# Search paths inside flatpak (/app for shstk, /usr for SDK-provided Qt)
+set(CMAKE_PREFIX_PATH /app;/usr CACHE PATH "Prefix path" FORCE)
+set(CMAKE_FIND_ROOT_PATH /app;/usr CACHE PATH "Find root path" FORCE)
 
 # CMake module path
 list(APPEND CMAKE_MODULE_PATH /app/cmake)
 
-# Skip system paths
+# Search in root path and programs from host
 set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY BOTH)
+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE BOTH)
+set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE BOTH)