cassidy/GlobalProtect-openconnect
1
0
Fork 0
mirror of https://github.com/yuezk/GlobalProtect-openconnect.git synced 2025-04-02 18:31:50 -04:00
Code Issues Projects Releases Wiki Activity

update install command

Browse Source
This commit is contained in:
Kevin Yue 2021-09-13 12:51:14 +08:00
parent 1fab2a1439
commit deddefc72a
5 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -36,3 +36,6 @@ add_3rdparty(
add_subdirectory(GPService) add_subdirectory(GPService)
add_subdirectory(GPClient) add_subdirectory(GPClient)
include(InstallRequiredSystemLibraries)
include(CPack)

10
GPClient/CMakeLists.txt
View File

@ -1,4 +1,4 @@
project(gpclient) project(GPClient)
set(gpclient_GENERATED_SOURCES) set(gpclient_GENERATED_SOURCES)
@ -21,6 +21,10 @@ add_executable(gpclient
samlloginwindow.cpp samlloginwindow.cpp
gpclient.cpp gpclient.cpp
settingsdialog.cpp settingsdialog.cpp
gpclient.ui
normalloginwindow.ui
settingsdialog.ui
resources.qrc
${gpclient_GENERATED_SOURCES} ${gpclient_GENERATED_SOURCES}
) )
@ -35,3 +39,7 @@ target_link_libraries(gpclient
Qt5::WebEngineWidgets Qt5::WebEngineWidgets
Qt5::DBus Qt5::DBus
) )
install(TARGETS gpclient DESTINATION bin)
install(FILES com.yuezk.qt.gpclient.desktop DESTINATION share/applications)
install(FILES com.yuezk.qt.GPClient.svg DESTINATION share/pixmaps)

7
GPService/CMakeLists.txt
View File

@ -1,4 +1,4 @@
project(gpservice) project(GPService)
set(gpservice_GENERATED_SOURCES) set(gpservice_GENERATED_SOURCES)
@ -27,3 +27,8 @@ target_link_libraries(gpservice
Qt5::Core Qt5::Core
Qt5::DBus Qt5::DBus
) )
install(TARGETS gpservice DESTINATION )
install(FILES "dbus/com.yuezk.qt.GPService.conf" DESTINATION "share/dbus-1/system.d" )
install(FILES "dbus/com.yuezk.qt.GPService.service" DESTINATION "share/dbus-1/system-services")
install(FILES "systemd/gpservice.service" DESTINATION "etc/systemd/system")

2
GPService/gpservice.cpp
View File

@ -40,7 +40,7 @@ QString GPService::findBinary()
} }
/* Port from https://github.com/qt/qtbase/blob/11d1dcc6e263c5059f34b44d531c9ccdf7c0b1d6/src/corelib/io/qprocess.cpp#L2115 */ /* Port from https://github.com/qt/qtbase/blob/11d1dcc6e263c5059f34b44d531c9ccdf7c0b1d6/src/corelib/io/qprocess.cpp#L2115 */
QStringList GPService::splitCommand(QStringView command) QStringList GPService::splitCommand(QString command)
{ {
QStringList args; QStringList args;
QString tmp; QString tmp;

2
GPService/gpservice.h
View File

@ -55,7 +55,7 @@ private:
void log(QString msg); void log(QString msg);
static QString findBinary(); static QString findBinary();
static QStringList splitCommand(QStringView command); static QStringList splitCommand(QString command);
}; };
#endif // GLOBALPROTECTSERVICE_H #endif // GLOBALPROTECTSERVICE_H