CI: rename INSTALL_QT to RABBIT_ENABLE_INSTALL_QT

KangLin · Apr 3, 2024 · 8b4904e · 8b4904e
1 parent 4646bbe
commit 8b4904e
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 10 deletions.
diff --git a/.github/workflows/msvc.yml b/.github/workflows/msvc.yml
@@ -176,7 +176,9 @@ jobs:
             -DVCPKG_APPLOCAL_DEPS=ON ^
             -DVCPKG_TRACE_FIND_PACKAGE=ON ^
             -DVCPKG_TARGET_TRIPLET=${{matrix.VCPKG_TARGET_TRIPLET}} ^
-            -DINSTALL_QT=ON ^
+            -DRABBIT_ENABLE_INSTALL_DEPENDENT=ON ^
+            -DRABBIT_ENABLE_INSTALL_QT=ON ^
+            -DRABBIT_ENABLE_INSTALL_TO_BUILD_PATH=OFF ^
             -DSeetaFace_DIR=${{env.INSTALL_DIR}}/lib/cmake ^
             -DSeetaNet_DIR=${{env.INSTALL_DIR}}/lib/cmake ^
             -DSeetaFaceDetector_DIR=${{env.INSTALL_DIR}}/lib/cmake ^

diff --git a/App/CMakeLists.txt b/App/CMakeLists.txt
@@ -76,27 +76,27 @@ set(OTHER_FILES
     ${CMAKE_SOURCE_DIR}/ChangeLog_zh_CN.md)
 INSTALL_FILE(SOURCES ${OTHER_FILES}
     DESTINATION ${CMAKE_INSTALL_DOCDIR}
-        COMPONENT Runtime)
+        COMPONENT Application)
 
 IF(WIN32)
     INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/Resource/image/FaceRecognizer.ico
         DESTINATION .
-            COMPONENT Runtime)
+            COMPONENT Application)
     INSTALL(FILES ${CMAKE_SOURCE_DIR}/Install/Install.nsi
         DESTINATION "${CMAKE_BINARY_DIR}"
-            COMPONENT Runtime)
+            COMPONENT Application)
 ENDIF()
 
 if(UNIX AND NOT ANDROID)
     INSTALL(FILES ${CMAKE_SOURCE_DIR}/share/FaceRecognizer.desktop
         DESTINATION "share/applications"
-            COMPONENT Runtime)
+            COMPONENT Application)
     INSTALL(PROGRAMS ${CMAKE_SOURCE_DIR}/share/FaceRecognizer.sh
         DESTINATION "${CMAKE_INSTALL_BINDIR}"
-            COMPONENT Runtime)
+            COMPONENT Application)
     INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/Resource/image/FaceRecognizer.png
         DESTINATION "share/pixmaps"
-            COMPONENT Runtime)
+            COMPONENT Application)
 endif()
 
 if(NOT EXISTS ${CMAKE_BINARY_DIR}/etc/FaceRecognizer_logqt.ini)
@@ -106,6 +106,6 @@ if(NOT EXISTS ${CMAKE_BINARY_DIR}/etc/FaceRecognizer_logqt.ini)
 endif()
 INSTALL_FILE(SOURCES ${CMAKE_SOURCE_DIR}/etc/FaceRecognizer_logqt.ini
     DESTINATION etc
-    COMPONENT Runtime)
+    COMPONENT Application)
 
 INSTALL_ICON_THEME(SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/Resource/icons)
diff --git a/Install/Install.nsi b/Install/Install.nsi
@@ -33,7 +33,7 @@ SetCompressor lzma
 ; Welcome page
 !insertmacro MUI_PAGE_WELCOME
 ; License page
-!insertmacro MUI_PAGE_LICENSE "share\doc\FaceRecognizer\License.md"
+!insertmacro MUI_PAGE_LICENSE "install\share\doc\FaceRecognizer\License.md"
 ; Components page
 !insertmacro MUI_PAGE_COMPONENTS
 ; Directory page

diff --git a/appveyor.yml b/appveyor.yml
@@ -121,7 +121,9 @@ build_script:
           -DCMARK_STATIC=ON ^
           -DQT_DIR=%QT_ROOT%/lib/cmake/Qt5 ^
           -DQt5_DIR=%QT_ROOT%/lib/cmake/Qt5 ^
-          -DINSTALL_QT=ON ^
+          -DRABBIT_ENABLE_INSTALL_DEPENDENT=ON ^
+          -DRABBIT_ENABLE_INSTALL_QT=ON ^
+          -DRABBIT_ENABLE_INSTALL_TO_BUILD_PATH=OFF ^
           -DCMAKE_BUILD_TYPE=Release ^
           -DCMAKE_INSTALL_PREFIX="%cd%/install" ^
           -DCMAKE_PREFIX_PATH="%INSTALL_DIR%" ^