From 1dbb4df5f37d6ec70a97432da5ef313bc5c9d25f Mon Sep 17 00:00:00 2001 From: Kevin Yue Date: Wed, 15 Sep 2021 13:41:00 +0800 Subject: [PATCH] improve cmake file --- CMakeLists.txt | 4 ++-- GPClient/CMakeLists.txt | 4 ++-- GPService/CMakeLists.txt | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3a65d48..f4e4099 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.14.0) +cmake_minimum_required(VERSION 3.7.0) project(GlobalProtect-openconnect VERSION 1.3.3 LANGUAGES CXX) @@ -20,4 +20,4 @@ find_package(Qt5 REQUIRED COMPONENTS ) add_subdirectory(GPService) -add_subdirectory(GPClient) \ No newline at end of file +add_subdirectory(GPClient) diff --git a/GPClient/CMakeLists.txt b/GPClient/CMakeLists.txt index b32eb2a..8c4f0be 100644 --- a/GPClient/CMakeLists.txt +++ b/GPClient/CMakeLists.txt @@ -70,8 +70,8 @@ target_link_libraries(gpclient Qt5::DBus ) -# target_compile_definitions(gpclient PUBLIC QAPPLICATION_CLASS=QApplication) +target_compile_definitions(gpclient PUBLIC QAPPLICATION_CLASS=QApplication) install(TARGETS gpclient DESTINATION "/usr/bin") install(FILES com.yuezk.qt.gpclient.desktop DESTINATION "/usr/share/applications") -install(FILES com.yuezk.qt.GPClient.svg DESTINATION "/usr/share/pixmaps") \ No newline at end of file +install(FILES com.yuezk.qt.GPClient.svg DESTINATION "/usr/share/pixmaps") diff --git a/GPService/CMakeLists.txt b/GPService/CMakeLists.txt index 5ea154b..c7205c3 100644 --- a/GPService/CMakeLists.txt +++ b/GPService/CMakeLists.txt @@ -49,7 +49,7 @@ target_link_libraries(gpservice Qt5::DBus ) -# target_compile_definitions(gpservice PUBLIC QAPPLICATION_CLASS=QCoreApplication) +target_compile_definitions(gpservice PUBLIC QAPPLICATION_CLASS=QCoreApplication) install(TARGETS gpservice DESTINATION "/usr/bin") install(FILES "dbus/com.yuezk.qt.GPService.conf" DESTINATION "/usr/share/dbus-1/system.d" )