From dc8e2a1beaee2da3e2adb4956b26bb88c484baa1 Mon Sep 17 00:00:00 2001
From: Guobang Bi <373318510@qq.com>
Date: Sat, 7 Mar 2020 16:07:54 +0800
Subject: [PATCH] using grpc by default

---
 .github/workflows/build-qv2ray-cmake.yml | 4 ++--
 cmake/backend.cmake                      | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build-qv2ray-cmake.yml b/.github/workflows/build-qv2ray-cmake.yml
index 0a547401..3f144821 100644
--- a/.github/workflows/build-qv2ray-cmake.yml
+++ b/.github/workflows/build-qv2ray-cmake.yml
@@ -99,7 +99,7 @@ jobs:
           cd build
           export _QV2RAY_BUILD_INFO_="Qv2ray built from Github Action"  
           export _QV2RAY_BUILD_EXTRA_INFO_="qt${{ matrix.qt_version }}-${{ github.sha }}"
-          cmake .. -DUSE_GRPC=ON
+          cmake ..
 
       - name: Linux - ${{ matrix.qt_version }} - Generate Dependencies and Makefile
         if: matrix.platform == 'ubuntu-16.04'
@@ -112,7 +112,7 @@ jobs:
           cd build
           export _QV2RAY_BUILD_INFO_="Qv2ray built from Github Action"  
           export _QV2RAY_BUILD_EXTRA_INFO_="qt${{ matrix.qt_version }}-${{ github.sha }}"
-          cmake .. -DUSE_GRPC=ON
+          cmake ..
 #qmake .. CONFIG+="debug_and_release no_increase_build_number" PREFIX=/usr
 # -------------------------------------------------------- Build
       - name: Build Qv2ray
diff --git a/cmake/backend.cmake b/cmake/backend.cmake
index 5b1ef792..e34be44a 100644
--- a/cmake/backend.cmake
+++ b/cmake/backend.cmake
@@ -1,4 +1,4 @@
-if(USE_GRPC)
+if(NOT USE_LIBQVB)
     find_program(GRPC_CPP_PLUGIN grpc_cpp_plugin)
     
     find_library(GRPC_LIBRARY NAMES grpc)
@@ -31,6 +31,7 @@ if(USE_GRPC)
         DEPENDS "${API_PROTO}"
     )
 else()
+    add_definitions(-DBACKEND_LIBQVB)
     if(UNIX AND NOT APPLE)
         set(QV2RAY_BACKEND_LIBRARIES ${CMAKE_SOURCE_DIR}/libs/libqvb-linux64.a)
     elseif(APPLE)