From 6fee4db4765b2442ab8d363b067175cf2fbbc2b0 Mon Sep 17 00:00:00 2001 From: reionwong Date: Sun, 25 Jul 2021 14:51:31 +0800 Subject: [PATCH] Fix github CI compilation --- .github/workflows/build.yml | 15 --------------- CMakeLists.txt | 2 +- polkit-agent/CMakeLists.txt | 2 +- 3 files changed, 2 insertions(+), 17 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e1547df..43854f5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,21 +19,6 @@ jobs: - name: Install the basic dev packages run: sudo apt-get install -y equivs curl git devscripts lintian build-essential automake autotools-dev cmake g++ - - - name: Clone FishUI - run: git clone https://github.com/cutefishos/fishui.git - - - name: Install FishUI dependencies - run: cd fishui ; sudo mk-build-deps -i -t "apt-get --yes" -r - - - name: Build FishUI - run: mkdir build; cd build; cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr .. ; make -j$(nproc); - - - name: Install FishUI - run: sudo make install - - - name: Back - run: cd ../../ - name: Install build dependencies run: sudo mk-build-deps -i -t "apt-get --yes" -r diff --git a/CMakeLists.txt b/CMakeLists.txt index 1c8a09f..142f5a5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,7 +12,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) set(QT Core Gui Widgets Quick QuickControls2 DBus X11Extras LinguistTools) find_package(Qt5 REQUIRED ${QT}) -find_package(FishUI REQUIRED) +# find_package(FishUI REQUIRED) find_package(PkgConfig REQUIRED) find_package(ECM REQUIRED NO_MODULE) diff --git a/polkit-agent/CMakeLists.txt b/polkit-agent/CMakeLists.txt index 6788325..cb858d4 100644 --- a/polkit-agent/CMakeLists.txt +++ b/polkit-agent/CMakeLists.txt @@ -22,7 +22,7 @@ target_link_libraries(cutefish-polkit-agent Qt5::Quick Qt5::QuickControls2 - FishUI + # FishUI ${POLKITQT-1_CORE_LIBRARY} ${POLKITQT-1_AGENT_LIBRARY}