Skip to content

Commit 81feb53

Browse files
KangLinKangLin
committed
Merge branch 'develop'
2 parents ba99d31 + 5407690 commit 81feb53

67 files changed

Lines changed: 1477 additions & 227 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/android.yml‎

Lines changed: 24 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,23 +13,18 @@ jobs:
1313
strategy:
1414
matrix:
1515
BUILD_TYPE: [Release]
16-
qt_arch: [android_arm64_v8a, android_armv7, android_x86_64]
17-
qt_version: [6.6.2]
16+
qt_arch: [android_arm64_v8a, android_x86_64]
17+
qt_version: [6.7.1]
1818
include:
1919
- qt_arch: android_arm64_v8a
2020
VCPKG_TARGET_TRIPLET: arm64-android
2121
ANDROID_ABI: arm64-v8a
22-
ENABLE_DOWNLOAD: ON
23-
24-
- qt_arch: android_armv7
25-
VCPKG_TARGET_TRIPLET: arm-android
26-
ANDROID_ABI: armeabi-v7a
27-
ENABLE_DOWNLOAD_MODULE: OFF
22+
ENABLE_DOWNLOAD_MODULE: ON
2823

2924
- qt_arch: android_x86_64
3025
VCPKG_TARGET_TRIPLET: x64-android
3126
ANDROID_ABI: x86_64
32-
ENABLE_DOWNLOAD: ON
27+
ENABLE_DOWNLOAD_MODULE: ON
3328

3429
runs-on: ubuntu-latest
3530

@@ -38,7 +33,7 @@ jobs:
3833
SOURCE_DIR: ${{github.workspace}}/.cache/source
3934
TOOSL_DIR: ${{github.workspace}}/.cache/tools
4035
INSTALL_DIR: ${{github.workspace}}/.cache/install_${{matrix.BUILD_TYPE}}
41-
VCPKGGITCOMMITID: 2ac6ba173be85207a7bac4f0f02f5486f9fd4c0f
36+
VCPKGGITCOMMITID: 007aaced1a9d3245e28a2ba9395dca88ea890db1
4237
VCPKG_TARGET_TRIPLET: ${{matrix.VCPKG_TARGET_TRIPLET}}
4338
VCPKG_DEFAULT_TRIPLET: ${{matrix.VCPKG_TARGET_TRIPLET}}
4439
VCPKG_DEFAULT_HOST_TRIPLET: x64-linux
@@ -134,13 +129,19 @@ jobs:
134129
-DCMAKE_BUILD_TYPE=${{ matrix.BUILD_TYPE }} \
135130
-DCMAKE_INSTALL_PREFIX=${{ env.INSTALL_DIR }} \
136131
-DCMAKE_VERBOSE_MAKEFILE=ON \
132+
-DCMAKE_BUILD_TYPE=${{ matrix.BUILD_TYPE }} \
133+
-DCMAKE_INSTALL_PREFIX=${{ env.INSTALL_DIR }} \
134+
-DBUILD_SHARED_LIBS=OFF \
135+
-DCMAKE_VERBOSE_MAKEFILE=ON \
137136
-DQT_HOST_PATH=${Qt6_DIR}/../gcc_64 \
138137
-DQT_CHAINLOAD_TOOLCHAIN_FILE=${{env.VCPKG_ROOT}}/scripts/buildsystems/vcpkg.cmake \
139138
-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${ANDROID_NDK_HOME}/build/cmake/android.toolchain.cmake \
140-
-DVCPKG_TARGET_TRIPLET=${{env.VCPKG_TARGET_TRIPLET}} \
139+
-DVCPKG_TARGET_TRIPLET=${{matrix.VCPKG_TARGET_TRIPLET}} \
141140
-DX_VCPKG_APPLOCAL_DEPS_INSTALL=ON \
142141
-DVCPKG_TRACE_FIND_PACKAGE=ON \
143-
-DVCPKG_INSTALLED_DIR=${{env.INSTALL_DIR}}/SeetaFace2/vcpkg_installed \
142+
-DVCPKG_VERBOSE=ON \
143+
-DVCPKG_INSTALLED_DIR=${{env.INSTALL_DIR}}/libvncserver/vcpkg_installed \
144+
-DANDROID_ABI=${{env.ANDROID_ABI}} \
144145
-DBUILD_EXAMPLE=OFF
145146
cmake --build . --verbose --config ${{matrix.BUILD_TYPE}}
146147
cmake --build . --verbose --config ${{matrix.BUILD_TYPE}} --target install
@@ -161,10 +162,13 @@ jobs:
161162
-DQT_HOST_PATH=${Qt6_DIR}/../gcc_64 \
162163
-DQT_CHAINLOAD_TOOLCHAIN_FILE=${{env.VCPKG_ROOT}}/scripts/buildsystems/vcpkg.cmake \
163164
-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${ANDROID_NDK_HOME}/build/cmake/android.toolchain.cmake \
164-
-DVCPKG_TARGET_TRIPLET=${{env.VCPKG_TARGET_TRIPLET}} \
165+
-DVCPKG_TARGET_TRIPLET=${{matrix.VCPKG_TARGET_TRIPLET}} \
165166
-DX_VCPKG_APPLOCAL_DEPS_INSTALL=ON \
166167
-DVCPKG_TRACE_FIND_PACKAGE=ON \
167-
-DVCPKG_INSTALLED_DIR=${{env.INSTALL_DIR}}/libfacedetection/vcpkg_installed
168+
-DVCPKG_VERBOSE=ON \
169+
-DVCPKG_INSTALLED_DIR=${{env.INSTALL_DIR}}/libvncserver/vcpkg_installed \
170+
-DANDROID_ABI=${{env.ANDROID_ABI}} \
171+
-DUSE_OPENMP=OFF
168172
cmake --build . --verbose --config ${{matrix.BUILD_TYPE}}
169173
cmake --build . --verbose --config ${{matrix.BUILD_TYPE}} --target install
170174
fi
@@ -189,11 +193,15 @@ jobs:
189193
-DCMARK_STATIC=ON \
190194
-DCMAKE_BUILD_TYPE=${{matrix.BUILD_TYPE}} \
191195
-DCMAKE_AUTOGEN_VERBOSE=ON \
196+
-DQT_HOST_PATH=${Qt6_DIR}/../gcc_64 \
192197
-DQT_CHAINLOAD_TOOLCHAIN_FILE=${{env.VCPKG_ROOT}}/scripts/buildsystems/vcpkg.cmake \
193198
-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${ANDROID_NDK_HOME}/build/cmake/android.toolchain.cmake \
194-
-DVCPKG_TARGET_TRIPLET=${{env.VCPKG_TARGET_TRIPLET}} \
199+
-DVCPKG_TARGET_TRIPLET=${{matrix.VCPKG_TARGET_TRIPLET}} \
195200
-DX_VCPKG_APPLOCAL_DEPS_INSTALL=ON \
196-
-DVCPKG_APPLOCAL_DEPS=ON \
201+
-DVCPKG_TRACE_FIND_PACKAGE=ON \
202+
-DVCPKG_VERBOSE=ON \
203+
-DVCPKG_INSTALLED_DIR=${{env.INSTALL_DIR}}/libvncserver/vcpkg_installed \
204+
-DANDROID_ABI=${{env.ANDROID_ABI}} \
197205
-DINSTALL_QT=ON \
198206
-DQT_HOST_PATH=${Qt6_DIR}/../gcc_64 \
199207
-DQT_ANDROID_SIGN_APK=ON \

‎.github/workflows/macos.yml‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ jobs:
1616
matrix:
1717
# Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
1818
BUILD_TYPE: [Release, Debug]
19-
qt_version: [6.6.2, 5.15.2, 5.12.12]
19+
qt_version: [6.7.1, 5.15.2, 5.12.12]
2020
qt_arch: [clang_64]
2121
VCPKG_TARGET_TRIPLET: [x64-osx]
2222
include:
23-
- qt_version: 6.6.2
23+
- qt_version: 6.7.1
2424
qt_modules: qtscxml qtpositioning qt5compat qtwebchannel qtwebsockets qtmultimedia
2525
ENABLE_DOWNLOAD_MODULE: ON
2626

@@ -30,15 +30,17 @@ jobs:
3030
- qt_version: 5.12.12
3131
ENABLE_DOWNLOAD_MODULE: OFF
3232

33-
runs-on: macos-latest
33+
# See: https://docs.github.com/zh/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners
34+
# See: https://github.com/actions/runner-images/tree/main
35+
runs-on: macos-13
3436

3537
env:
3638
BUILD_TYPE: ${{ matrix.BUILD_TYPE }}
3739
SOURCE_DIR: ${{github.workspace}}/.cache/source
3840
TOOSL_DIR: ${{github.workspace}}/.cache/tools
3941
INSTALL_DIR: ${{github.workspace}}/.cache/install_2024_03_13
4042
qt_modules: qtwebengine ${{matrix.qt_modules}}
41-
VCPKGGITCOMMITID: 2ac6ba173be85207a7bac4f0f02f5486f9fd4c0f
43+
VCPKGGITCOMMITID: 007aaced1a9d3245e28a2ba9395dca88ea890db1
4244
VCPKG_TARGET_TRIPLET: ${{matrix.VCPKG_TARGET_TRIPLET}}
4345
artifact_name: build_macos
4446
FaceRecognizer_VERSION: v0.0.4
@@ -116,7 +118,7 @@ jobs:
116118
-DX_VCPKG_APPLOCAL_DEPS_INSTALL=ON \
117119
-DVCPKG_VERBOSE=ON \
118120
-DVCPKG_TARGET_TRIPLET=${{matrix.VCPKG_TARGET_TRIPLET}} \
119-
-DBUILD_EXAMPLE=OFF
121+
-DUSE_OPENMP=OFF
120122
cmake --build . --config ${{matrix.BUILD_TYPE}}
121123
cmake --build . --config ${{matrix.BUILD_TYPE}} --target install
122124
fi
@@ -175,7 +177,7 @@ jobs:
175177
7z a FaceRecognizer_${{env.FaceRecognizer_VERSION}}_macos_qt${{matrix.qt_version}}.zip ./install/*
176178
177179
- name: Update artifact
178-
if: ${{ matrix.BUILD_TYPE == 'Release' }}
180+
if: ${{ matrix.BUILD_TYPE == 'Release' && matrix.qt_version == '6.7.1' }}
179181
uses: actions/upload-artifact@v3
180182
with:
181183
name: ${{ env.artifact_name }}

‎.github/workflows/mingw.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,8 @@ jobs:
118118
-DCMAKE_BUILD_TYPE=${{matrix.BUILD_TYPE}} ^
119119
-DCMAKE_INSTALL_PREFIX=${{github.workspace}}\build\install ^
120120
-DCMAKE_PREFIX_PATH=${{env.INSTALL_DIR}} ^
121-
-DSeetaFace_DIR=${{env.INSTALL_DIR}}\lib\cmake\SeetaFace2
121+
-DSeetaFace_DIR=${{env.INSTALL_DIR}}\lib\cmake\SeetaFace2 ^
122+
-DUSE_OPENMP=OFF
122123
cmake --build . --config ${{ matrix.BUILD_TYPE }}
123124
cmake --build . --config ${{ matrix.BUILD_TYPE }} --target install
124125

‎.github/workflows/msvc.yml‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,27 +13,27 @@ jobs:
1313
strategy:
1414
matrix:
1515
BUILD_TYPE: [Release, Debug]
16-
qt_version: [6.6.2, 5.15.2, 5.12.12]
16+
qt_version: [6.7.1, 5.15.2, 5.12.12]
1717
include:
18-
- qt_version: 6.6.2
18+
- qt_version: 6.7.1
1919
qt_arch: win64_msvc2019_64
2020
qt_modules: qtscxml qtpositioning qtwebchannel qtwebsockets qtwebview qtmultimedia qt5compat
2121
VCPKG_TARGET_TRIPLET: x64-windows
22-
VCPKG_PLATFORM_TOOLSET: v142
22+
VCPKG_PLATFORM_TOOLSET: v143
2323
CMAKE_GENERATOR_PLATFORM: x64
2424
ENABLE_DOWNLOAD_MODULE: ON
2525

2626
- qt_version: 5.15.2
2727
qt_arch: win64_msvc2019_64
2828
VCPKG_TARGET_TRIPLET: x64-windows
29-
VCPKG_PLATFORM_TOOLSET: v142
29+
VCPKG_PLATFORM_TOOLSET: v143
3030
CMAKE_GENERATOR_PLATFORM: x64
3131
ENABLE_DOWNLOAD_MODULE: OFF
3232

3333
- qt_version: 5.12.12
3434
qt_arch: win32_msvc2017
3535
VCPKG_TARGET_TRIPLET: x86-windows
36-
VCPKG_PLATFORM_TOOLSET: v141
36+
VCPKG_PLATFORM_TOOLSET: v143
3737
CMAKE_GENERATOR_PLATFORM: Win32
3838
ENABLE_DOWNLOAD_MODULE: OFF
3939

@@ -45,7 +45,7 @@ jobs:
4545
INSTALL_DIR: ${{github.workspace}}\.cache\install_msvc_${{matrix.CMAKE_GENERATOR_PLATFORM}}_${{matrix.BUILD_TYPE}}
4646
CMAKE_GENERATOR: "Visual Studio 17 2022"
4747
CMAKE_GENERATOR_PLATFORM: ${{matrix.CMAKE_GENERATOR_PLATFORM}}
48-
VCPKGGITCOMMITID: 2ac6ba173be85207a7bac4f0f02f5486f9fd4c0f
48+
VCPKGGITCOMMITID: 007aaced1a9d3245e28a2ba9395dca88ea890db1
4949
VCPKG_PLATFORM_TOOLSET: ${{matrix.VCPKG_PLATFORM_TOOLSET}}
5050
VCPKG_TARGET_TRIPLET: ${{matrix.VCPKG_TARGET_TRIPLET}}
5151
qt_modules: qtwebengine ${{matrix.qt_modules}}
@@ -107,7 +107,7 @@ jobs:
107107
-DX_VCPKG_APPLOCAL_DEPS_INSTALL=ON ^
108108
-DVCPKG_INSTALLED_DIR=${{env.INSTALL_DIR}}/SeetaFace2/vcpkg_installed ^
109109
-DVCPKG_TRACE_FIND_PACKAGE=ON ^
110-
-DBUILD_EXAMPLE=OFF
110+
-DUSE_OPENMP=OFF
111111
cmake --build . --config ${{matrix.BUILD_TYPE}}
112112
cmake --build . --config ${{matrix.BUILD_TYPE}} --target install
113113
)
@@ -172,11 +172,13 @@ jobs:
172172
-DCMAKE_INSTALL_PREFIX=${{github.workspace}}/build/install ^
173173
-DCMAKE_TOOLCHAIN_FILE=${{env.VCPKG_ROOT}}/scripts/buildsystems/vcpkg.cmake ^
174174
-DVCPKG_VERBOSE=ON ^
175-
-DX_VCPKG_APPLOCAL_DEPS_INSTALL=ON ^
176-
-DVCPKG_APPLOCAL_DEPS=ON ^
177-
-DVCPKG_TRACE_FIND_PACKAGE=ON ^
178175
-DVCPKG_TARGET_TRIPLET=${{matrix.VCPKG_TARGET_TRIPLET}} ^
179-
-DINSTALL_QT=ON ^
176+
-DX_VCPKG_APPLOCAL_DEPS_INSTALL=OFF ^
177+
-DVCPKG_APPLOCAL_DEPS=OFF ^
178+
-DVCPKG_TRACE_FIND_PACKAGE=ON ^
179+
-DRABBIT_ENABLE_INSTALL_DEPENDENT=ON ^
180+
-DRABBIT_ENABLE_INSTALL_QT=ON ^
181+
-DRABBIT_ENABLE_INSTALL_TO_BUILD_PATH=OFF ^
180182
-DSeetaFace_DIR=${{env.INSTALL_DIR}}/lib/cmake ^
181183
-DSeetaNet_DIR=${{env.INSTALL_DIR}}/lib/cmake ^
182184
-DSeetaFaceDetector_DIR=${{env.INSTALL_DIR}}/lib/cmake ^
@@ -201,7 +203,7 @@ jobs:
201203
copy /Y FaceRecognizer_${{env.FaceRecognizer_VERSION}}_Setup.exe FaceRecognizer_${{env.FaceRecognizer_VERSION}}_${{matrix.qt_arch}}_qt${{matrix.qt_version}}_Setup.exe
202204
203205
- name: Update configure file
204-
if: ${{ matrix.BUILD_TYPE == 'Release' && matrix.qt_version == '6.6.2' }}
206+
if: ${{ matrix.BUILD_TYPE == 'Release' && matrix.qt_version == '6.7.1' }}
205207
working-directory: ${{github.workspace}}\build
206208
run: |
207209
${{github.workspace}}\build\install\bin\FaceRecognizerApp.exe ^
@@ -213,7 +215,7 @@ jobs:
213215
-m "${{env.FaceRecognizer_VERSION}}"
214216
215217
- name: Update artifact
216-
if: ${{ matrix.BUILD_TYPE == 'Release' && matrix.qt_version == '6.6.2' }}
218+
if: ${{ matrix.BUILD_TYPE == 'Release' && matrix.qt_version == '6.7.1' }}
217219
uses: actions/upload-artifact@v3
218220
with:
219221
name: ${{ env.artifact_name }}

‎.github/workflows/ubuntu.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,8 @@ jobs:
104104
cmake .. \
105105
-DCMAKE_BUILD_TYPE=${{matrix.BUILD_TYPE}} \
106106
-DBUILD_SHARED_LIBS=ON \
107-
-DCMAKE_INSTALL_PREFIX="${{ env.INSTALL_DIR }}"
107+
-DCMAKE_INSTALL_PREFIX="${{ env.INSTALL_DIR }}" \
108+
-DUSE_OPENMP=OFF
108109
cmake --build . --config ${{matrix.BUILD_TYPE}}
109110
cmake --build . --config ${{matrix.BUILD_TYPE}} --target install
110111
fi

‎App/CMakeLists.txt‎

Lines changed: 10 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,3 @@
1-
cmake_minimum_required(VERSION 2.8)
2-
3-
if(POLICY CMP0083)
4-
cmake_policy(SET CMP0083 NEW)
5-
endif()
6-
7-
if(POLICY CMP0020)
8-
cmake_policy(SET CMP0020 NEW)
9-
endif()
101

112
project(FaceRecognizerApp
123
DESCRIPTION "Face recognizer"
@@ -60,11 +51,6 @@ set(SOURCE_UI_FILES
6051
FrmBrowseFile.ui
6152
)
6253

63-
64-
add_definitions(-DBUILD_VERSION="${FaceRecognizer_VERSION}")
65-
add_definitions(-DBUILD_ARCH="${BUILD_ARCH}")
66-
add_definitions(-DBUILD_PLATFORM="${BUILD_PLATFORM}")
67-
6854
SET(RCC_FILES
6955
Resource/Resource.qrc
7056
${TRANSLATIONS_QRC_FILES})
@@ -90,27 +76,27 @@ set(OTHER_FILES
9076
${CMAKE_SOURCE_DIR}/ChangeLog_zh_CN.md)
9177
INSTALL_FILE(SOURCES ${OTHER_FILES}
9278
DESTINATION ${CMAKE_INSTALL_DOCDIR}
93-
COMPONENT Runtime)
79+
COMPONENT Application)
9480

9581
IF(WIN32)
9682
INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/Resource/image/FaceRecognizer.ico
9783
DESTINATION .
98-
COMPONENT Runtime)
99-
INSTALL(FILES ${CMAKE_SOURCE_DIR}/Install/Install.nsi
100-
DESTINATION "${CMAKE_BINARY_DIR}"
101-
COMPONENT Runtime)
84+
COMPONENT Application)
85+
# 替换 Install.nsi 中的 CMAKE_INSTALL_PREFIX 等
86+
configure_file(${CMAKE_SOURCE_DIR}/Install/Install.nsi
87+
${CMAKE_BINARY_DIR}/Install.nsi @ONLY)
10288
ENDIF()
10389

10490
if(UNIX AND NOT ANDROID)
105-
INSTALL(FILES ${CMAKE_SOURCE_DIR}/share/FaceRecognizer.desktop
91+
INSTALL(FILES ${CMAKE_SOURCE_DIR}/share/org.Rabbit.FaceRecognizer.desktop
10692
DESTINATION "share/applications"
107-
COMPONENT Runtime)
93+
COMPONENT Application)
10894
INSTALL(PROGRAMS ${CMAKE_SOURCE_DIR}/share/FaceRecognizer.sh
10995
DESTINATION "${CMAKE_INSTALL_BINDIR}"
110-
COMPONENT Runtime)
96+
COMPONENT Application)
11197
INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/Resource/image/FaceRecognizer.png
11298
DESTINATION "share/pixmaps"
113-
COMPONENT Runtime)
99+
COMPONENT Application)
114100
endif()
115101

116102
if(NOT EXISTS ${CMAKE_BINARY_DIR}/etc/FaceRecognizer_logqt.ini)
@@ -120,6 +106,6 @@ if(NOT EXISTS ${CMAKE_BINARY_DIR}/etc/FaceRecognizer_logqt.ini)
120106
endif()
121107
INSTALL_FILE(SOURCES ${CMAKE_SOURCE_DIR}/etc/FaceRecognizer_logqt.ini
122108
DESTINATION etc
123-
COMPONENT Runtime)
109+
COMPONENT Application)
124110

125111
INSTALL_ICON_THEME(SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/Resource/icons)

‎App/MainWindow.cpp‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ MainWindow::MainWindow(QWidget *parent) :
115115
QCameraInfo::availableCameras();
116116
#endif
117117
foreach (auto cameraInfo, cameras) {
118-
//qDebug(log) << "Camer name:" << cameraInfo.deviceName();
118+
qDebug(log) << "Camer name:" << cameraInfo.description();
119119
cmbCameras->addItem(cameraInfo.description());
120120
}
121121

@@ -133,8 +133,10 @@ MainWindow::MainWindow(QWidget *parent) :
133133
InitCamerOrientation();
134134
}
135135

136-
} else
136+
} else {
137+
qWarning(log) << "No cameras devices";
137138
ui->actionFile->setChecked(true);
139+
}
138140

139141
#ifdef RABBITCOMMON
140142
CFrmUpdater updater;
@@ -598,7 +600,7 @@ void MainWindow::on_actionUpdate_U_triggered()
598600

599601
void MainWindow::on_actionExit_triggered()
600602
{
601-
qApp->quit();
603+
QCoreApplication::quit();
602604
}
603605

604606
void MainWindow::on_actionAiLibraries_triggered(QAction* a)

App/Resource/icons/black/index.theme renamed to App/Resource/icons/rabbit-black/index.theme

File renamed without changes.

App/Resource/icons/black/svg/face-recognizer.svg renamed to App/Resource/icons/rabbit-black/svg/face-recognizer.svg

File renamed without changes.

App/Resource/icons/black/svg/image.svg renamed to App/Resource/icons/rabbit-black/svg/image.svg

File renamed without changes.

0 commit comments

Comments
 (0)