diff options
| author | saturneric <[email protected]> | 2024-07-30 15:49:49 +0000 |
|---|---|---|
| committer | saturneric <[email protected]> | 2024-07-30 15:49:49 +0000 |
| commit | 0b8da5767ec709f5ea1e1e1fc502715ab6280aa2 (patch) | |
| tree | 35de8fffd1525f0adff8794cf07e5ee1e7a7628c | |
| parent | fix: should add find package GTest (diff) | |
| download | GpgFrontend-0b8da5767ec709f5ea1e1e1fc502715ab6280aa2.tar.gz GpgFrontend-0b8da5767ec709f5ea1e1e1fc502715ab6280aa2.zip | |
fix: remove googletest, libarchive and mimalloc source code from repo
| -rw-r--r-- | .github/workflows/release.yml | 4 | ||||
| -rw-r--r-- | .gitmodules | 9 | ||||
| -rw-r--r-- | third_party/CMakeLists.txt | 7 | ||||
| m--------- | third_party/googletest | 0 | ||||
| m--------- | third_party/libarchive | 0 | ||||
| m--------- | third_party/mimalloc | 0 |
6 files changed, 3 insertions, 17 deletions
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 18d41b8c..19e098ae 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -162,11 +162,11 @@ jobs: ./autogen.sh ./configure --enable-maintainer-mode --enable-languages=cpp --disable-gpg-test && make -j4 make install - cd ${{github.workspace}} if: matrix.os == 'windows-2019' - name: Build mimalloc (Linux) run: | + git clone --depth 1 --branch v2.1.7 https://github.com/microsoft/mimalloc.git ${{github.workspace}}/third_party/mimalloc cd ${{github.workspace}}/third_party/mimalloc mkdir build && cd build cmake -G Ninja -DMI_SECURE=ON .. @@ -177,6 +177,7 @@ jobs: - name: Build mimalloc (Windows) shell: msys2 {0} run: | + git clone --depth 1 --branch v2.1.7 https://github.com/microsoft/mimalloc.git ${{github.workspace}}/third_party/mimalloc cd $(echo "/${{github.workspace}}" | sed 's/\\/\//g' | sed 's/://') cd third_party/mimalloc mkdir build && cd build @@ -186,6 +187,7 @@ jobs: - name: Build googletest (Linux) run: | + git clone --depth 1 --branch v1.15.0 https://github.com/google/googletest.git ${{github.workspace}}/third_party/googletest cd ${{github.workspace}}/third_party/googletest mkdir build && cd build cmake -G Ninja -DBUILD_SHARED_LIBS=ON .. diff --git a/.gitmodules b/.gitmodules index 884e10f7..08a70b2f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,15 +1,6 @@ [submodule "third_party/qt-aes"] path = third_party/qt-aes url = https://github.com/bricke/Qt-AES.git -[submodule "third_party/mimalloc"] - path = third_party/mimalloc - url = https://github.com/microsoft/mimalloc.git -[submodule "third_party/googletest"] - path = third_party/googletest - url = https://github.com/google/googletest.git -[submodule "third_party/libarchive"] - path = third_party/libarchive - url = https://github.com/libarchive/libarchive.git [submodule "third_party/qttranslations"] path = third_party/qttranslations url = https://github.com/qt/qttranslations.git diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt index d5dd9230..8c57bf93 100644 --- a/third_party/CMakeLists.txt +++ b/third_party/CMakeLists.txt @@ -22,10 +22,3 @@ # Saturneric <[email protected]> starting on May 12, 2021. # # SPDX-License-Identifier: GPL-3.0-or-later - -# ASAN checking -if(ENABLE_ASAN AND NOT APPLE AND ${CMAKE_BUILD_TYPE} STREQUAL "Debug") - # set(MI_TRACK_VALGRIND ON) - set(MI_TRACK_ASAN ON) - add_subdirectory(mimalloc EXCLUDE_FROM_ALL) -endif()
\ No newline at end of file diff --git a/third_party/googletest b/third_party/googletest deleted file mode 160000 -Subproject e39786088138f2749d64e9e90e0f9902daa77c4 diff --git a/third_party/libarchive b/third_party/libarchive deleted file mode 160000 -Subproject 60f086b37fc40952530d385e9f7a05ebec3dd9a diff --git a/third_party/mimalloc b/third_party/mimalloc deleted file mode 160000 -Subproject 8c532c32c3c96e5ba1f2283e032f69ead8add00 |