Scrip: modify build QFtpServer

Author: KangLin

.github/workflows/msvc.yml

@@ -18,7 +18,6 @@ jobs:
           - CMAKE_GENERATOR_PLATFORM: x64
             VCPKG_TARGET_TRIPLET: x64-windows
             VCPKG_PLATFORM_TOOLSET: v143
-            VCPKG_NO_DEBUG: ON
             BUILD_TYPE: Release
             qt_version: 6.9.3
             qt_arch: win64_msvc2022_64
@@ -28,7 +27,6 @@ jobs:
           - CMAKE_GENERATOR_PLATFORM: arm64
             VCPKG_TARGET_TRIPLET: arm64-windows
             VCPKG_PLATFORM_TOOLSET: v143
-            VCPKG_NO_DEBUG: ON
             BUILD_TYPE: Release
             qt_version: 6.9.3
             qt_arch: win64_msvc2022_arm64
@@ -39,7 +37,6 @@ jobs:
             VCPKG_TARGET_TRIPLET: x86-windows
             VCPKG_PLATFORM_TOOLSET: v143
             VCPKG_OVERLAY_PORTS: "vcpkg/ports"
-            VCPKG_NO_DEBUG: ON
             BUILD_TYPE: Release
             #VCPKG_MANIFEST_FEATURES: "ffmpeg"
             qt_version: 5.15.2
@@ -64,7 +61,6 @@ jobs:
       VCPKG_OVERLAY_PORTS: "${{github.workspace}}/${{matrix.VCPKG_OVERLAY_PORTS}}"
       VCPKG_MANIFEST_FEATURES: "freerdp;vnc;terminal;filetransfer"
       VCPKG_INSTALLED_DIR: ${{github.workspace}}\.cache\install
-      VCPKG_NO_DEBUG: ${{matrix.VCPKG_NO_DEBUG}}
       VCPKG_BUILD_TYPE: ${{matrix.BUILD_TYPE}}
       CMAKE_GENERATOR: "Visual Studio 17 2022"
       CMAKE_GENERATOR_PLATFORM: ${{matrix.CMAKE_GENERATOR_PLATFORM}}
@@ -395,7 +391,8 @@ jobs:
                   -DVCPKG_TARGET_TRIPLET=${{matrix.VCPKG_TARGET_TRIPLET}} ^
                   -DX_VCPKG_APPLOCAL_DEPS_INSTALL=ON ^
                   -DVCPKG_APPLOCAL_DEPS=ON ^
-                  -DVCPKG_TRACE_FIND_PACKAGE=ON
+                  -DVCPKG_TRACE_FIND_PACKAGE=ON ^
+                  -DWITH_APP=OFF
               cmake --build .  --config ${{matrix.BUILD_TYPE}}
               cmake --build .  --config ${{matrix.BUILD_TYPE}} --target install
           )

.github/workflows/vcpkg.yml

@@ -2,9 +2,9 @@
 
 name: vcpkg
 
-#on:
-#  push:
-#  pull_request:
+on:
+ push:
+ pull_request:
 
 jobs:
   vcpkg:
@@ -107,7 +107,6 @@ jobs:
             -DVCPKG_MANIFEST_FEATURES="${{env.VCPKG_MANIFEST_FEATURES}}" `
             -DVCPKG_INSTALL_OPTIONS="--x-buildtrees-root=d:/b" `
             -DVCPKG_BUILD_TYPE=Release `
-            -DVCPKG_NO_DEBUG=ON `
             -DVCPKG_VERBOSE=ON `
             -DVCPKG_TARGET_TRIPLET="${{env.VCPKG_TARGET_TRIPLET}}" `
             -DX_VCPKG_APPLOCAL_DEPS_INSTALL=ON `

Package/Flatpak/io.github.KangLin.RabbitRemoteControl.yml

@@ -312,6 +312,7 @@ modules:
     builddir: true
     config-opts:
       - -DCMAKE_BUILD_TYPE=Release
+      - -DWITH_APP=OFF
 
   - name: RabbitCommon
     disabled: false

Script/build_depend.sh

@@ -873,7 +873,8 @@ if [ $QFtpServer -eq 1 ]; then
         pushd $BUILD_DEPEND_DIR/QFtpServer
         cmake -S $SOURCE_DIR/QFtpServer -DCMAKE_BUILD_TYPE=Release \
             -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} \
-            -DCMAKE_VERBOSE_MAKEFILE=${BUILD_VERBOSE}
+            -DCMAKE_VERBOSE_MAKEFILE=${BUILD_VERBOSE} \
+            -DWITH_APP=OFF
         cmake --build . --config Release --parallel $(nproc)
         cmake --build . --config Release --target install
         popd

Src/CMakeLists.txt

@@ -351,7 +351,7 @@ ADD_TARGET(NAME ${PROJECT_NAME}
     )
 
 if(ANDROID)
-    if(INSTALL_QTKEYCHAIN)
+    if(INSTALL_QTKEYCHAIN AND Qt${QT_VERSION_MAJOR}Keychain_FOUND)
         set_target_properties(${PROJECT_NAME} PROPERTIES
             QT_ANDROID_EXTRA_LIBS $<TARGET_SONAME_FILE:Qt${QT_VERSION_MAJOR}Keychain::Qt${QT_VERSION_MAJOR}Keychain>)
     endif()

snap/snapcraft.yaml

@@ -308,6 +308,7 @@ parts:
     cmake-parameters:
       - -DCMAKE_BUILD_TYPE=Release
       - -DCMAKE_PREFIX_PATH=$CRAFT_STAGE/usr/local/
+      - -DWITH_APP=OFF
     prime:
       - -usr/local/include