fix(project): remove automatic build

1. libarchive
2. libconfig++

4 files changed, 11 insertions, 23 deletions

diff --git a/.github/workflows/debug.yml b/.github/workflows/debug.yml
index e96cfb6f..4cfbfc07 100644
--- a/.github/workflows/debug.yml
+++ b/.github/workflows/debug.yml
@@ -41,7 +41,7 @@ jobs:
         run: |
           sudo apt-get update
           sudo apt-get -y install build-essential binutils git autoconf automake gettext texinfo
-          sudo apt-get -y install gcc g++ libconfig++-dev libboost-all-dev ninja-build
+          sudo apt-get -y install gcc g++ libconfig++-dev libboost-all-dev ninja-build libarchive-dev
           sudo apt-get -y install gpg
         if: matrix.os == 'ubuntu-latest'
 
@@ -62,7 +62,7 @@ jobs:
       - name: Install Dependence (macOS)
         run: |
           brew install cmake git autoconf automake qt@5 texinfo gettext [email protected] 
-          brew install boost ninja
+          brew install boost ninja libarchive libconfig
           brew unlink gettext && brew link --force gettext
           brew link qt@5
           brew link [email protected] --force
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 70a883d5..7ec2a2ab 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -44,7 +44,7 @@ jobs:
         run: |
           sudo apt-get update
           sudo apt-get -y install build-essential binutils git autoconf automake gettext texinfo
-          sudo apt-get -y install gcc-8 g++-8 libconfig++-dev libboost-all-dev
+          sudo apt-get -y install gcc-8 g++-8 libconfig++-dev libboost-all-dev libarchive-dev
           sudo apt-get -y install gpgsm libxcb-xinerama0 libxcb-icccm4-dev libcups2-dev libdrm-dev libegl1-mesa-dev
           sudo apt-get -y install libgcrypt11-dev libnss3-dev libpci-dev libpulse-dev libudev-dev libxtst-dev gyp ninja-build
           sudo apt-get -y install libglu1-mesa-dev libfontconfig1-dev libx11-xcb-dev libicu-dev libxcb-image0
@@ -69,7 +69,7 @@ jobs:
       - name: Install Dependence (macOS)
         run: |
           brew install cmake git autoconf automake qt@5 texinfo gettext [email protected] 
-          brew install boost ninja
+          brew install boost ninja libarchive libconfig
           brew unlink gettext && brew link --force gettext
           brew link qt@5
           brew link [email protected] --force
@@ -148,7 +148,7 @@ jobs:
 
       - name: Notarize Release Build (macOS)
         run: |
-          xcrun altool --notarize-app -f ${{github.workspace}}/build/artifactOut/GpgFrontend-${{steps.vars.outputs.sha_short}}-x86_64.dmg  --primary-bundle-id pub.gpgfrontend.gpgfrontend -u ${{secrets.APPLE_DEVELOPER_ID}} -p ${{secrets.APPLE_DEVELOPER_ID_SECRET}}
+          xcrun altool --notarize-app -f ${{github.workspace}}/build/artifactOut/GpgFrontend-${{steps.vars.outputs.sha_short}}-x86_64.dmg  a
         if: matrix.os == 'macos-10.15'
 
       - name: Package App Image (Linux)
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 7903ef80..7f4d5066 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -64,7 +64,7 @@ if (MINGW)
     find_library(LIBARCHIVE_LIB libarchive.a)
     target_link_libraries(gpgfrontend_core ${LIBARCHIVE_LIB} b2 expat lz4 zstd bcrypt lzma bz2 z)
 else ()
-    target_link_libraries(gpgfrontend_core archive_static)
+    target_link_libraries(gpgfrontend_core archive)
 endif ()
 # link json
 target_link_libraries(gpgfrontend_core
diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt
index 0df99211..74e54099 100644
--- a/third_party/CMakeLists.txt
+++ b/third_party/CMakeLists.txt
@@ -26,17 +26,17 @@
 
 # easyloggingpp
 set(build_static_lib 1 CACHE BOOL "" FORCE)
-add_subdirectory(easyloggingpp)
+add_subdirectory(easyloggingpp EXCLUDE_FROM_ALL)
 target_include_directories(easyloggingpp PUBLIC
         ${CMAKE_CURRENT_SOURCE_DIR}/easyloggingpp/src)
 
 # json
 set(JSON_BuildTests OFF CACHE INTERNAL "")
-add_subdirectory(json)
+add_subdirectory(json EXCLUDE_FROM_ALL)
 
 # qt-aes
 include(GenerateExportHeader)
-add_subdirectory(qt-aes)
+add_subdirectory(qt-aes EXCLUDE_FROM_ALL)
 
 # vmime
 set(VMIME_HAVE_MESSAGING_PROTO_SENDMAIL OFF CACHE BOOL "" FORCE)
@@ -53,7 +53,7 @@ set(VMIME_INCLUDES ${VMIME_DIR}/src ${CMAKE_BINARY_DIR}/src/vmime/ ${CMAKE_BINAR
 
 set(VMIME_BIN_STATIC_LIB ${VMIME_BIN}/build/lib/libvmime.a)
 
-add_subdirectory(vmime)
+add_subdirectory(vmime EXCLUDE_FROM_ALL)
 
 add_library(gpgfrontend_vmime STATIC IMPORTED GLOBAL)
 add_dependencies(gpgfrontend_vmime vmime-static vmime-static-config)
@@ -66,7 +66,6 @@ include(ExternalProject)
 
 # libgpg-error
 
-
 if (NOT MINGW)
     set(GPG_ERROR_DIR ${CMAKE_CURRENT_SOURCE_DIR}/libgpg-error)
     set(GPG_ERROR_BIN ${CMAKE_CURRENT_BINARY_DIR}/libgpg-error)
@@ -203,15 +202,4 @@ endif ()
 
 # encoding detect library
 aux_source_directory(./encoding-detect ENCODING_DETECT_SOURCE_CODE)
-add_library(encoding_detect STATIC ${ENCODING_DETECT_SOURCE_CODE})
-
-# libarchive
-if (NOT MINGW)
-    remove_definitions(-DDEBUG)
-    add_subdirectory(libarchive)
-endif ()
-
-if (NOT MINGW)
-# libconfig
-add_subdirectory(libconfig)
-endif ()
\ No newline at end of file
+add_library(encoding_detect STATIC ${ENCODING_DETECT_SOURCE_CODE})
\ No newline at end of file