diff --git a/GPClient/GPClient.pro b/GPClient/GPClient.pro deleted file mode 100644 index ec6f90b..0000000 --- a/GPClient/GPClient.pro +++ /dev/null @@ -1,83 +0,0 @@ -TARGET = gpclient - -QT += core gui network websockets dbus webenginewidgets - -greaterThan(QT_MAJOR_VERSION, 4): QT += widgets - -CONFIG += c++11 - -include(../singleapplication/singleapplication.pri) -DEFINES += QAPPLICATION_CLASS=QApplication - -# The following define makes your compiler emit warnings if you use -# any Qt feature that has been marked deprecated (the exact warnings -# depend on your compiler). Please consult the documentation of the -# deprecated API in order to know how to port your code away from it. -DEFINES += QT_DEPRECATED_WARNINGS - -INCLUDEPATH += ../plog/include - -# You can also make your code fail to compile if it uses deprecated APIs. -# In order to do so, uncomment the following line. -# You can also select to disable deprecated APIs only up to a certain version of Qt. -#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 -SOURCES += \ - cdpcommand.cpp \ - cdpcommandmanager.cpp \ - enhancedwebview.cpp \ - gatewayauthenticator.cpp \ - gatewayauthenticatorparams.cpp \ - gpgateway.cpp \ - gphelper.cpp \ - loginparams.cpp \ - main.cpp \ - normalloginwindow.cpp \ - portalauthenticator.cpp \ - portalconfigresponse.cpp \ - preloginresponse.cpp \ - samlloginwindow.cpp \ - gpclient.cpp \ - settingsdialog.cpp - -HEADERS += \ - cdpcommand.h \ - cdpcommandmanager.h \ - enhancedwebview.h \ - gatewayauthenticator.h \ - gatewayauthenticatorparams.h \ - gpgateway.h \ - gphelper.h \ - loginparams.h \ - normalloginwindow.h \ - portalauthenticator.h \ - portalconfigresponse.h \ - preloginresponse.h \ - samlloginwindow.h \ - gpclient.h \ - settingsdialog.h - -FORMS += \ - gpclient.ui \ - normalloginwindow.ui \ - settingsdialog.ui - -DBUS_INTERFACES += ../GPService/gpservice.xml - -# Default rules for deployment. -target.path = /usr/bin -INSTALLS += target - -DISTFILES += \ - com.yuezk.qt.GPClient.svg \ - com.yuezk.qt.gpclient.desktop - -desktop_entry.path = /usr/share/applications/ -desktop_entry.files = com.yuezk.qt.gpclient.desktop - -desktop_icon.path = /usr/share/pixmaps/ -desktop_icon.files = com.yuezk.qt.GPClient.svg - -INSTALLS += desktop_entry desktop_icon - -RESOURCES += \ - resources.qrc diff --git a/GPService/GPService.pro b/GPService/GPService.pro deleted file mode 100644 index 4d22009..0000000 --- a/GPService/GPService.pro +++ /dev/null @@ -1,52 +0,0 @@ -TARGET = gpservice - -QT += dbus -QT -= gui - -CONFIG += c++11 console -CONFIG -= app_bundle - -include(../singleapplication/singleapplication.pri) -DEFINES += QAPPLICATION_CLASS=QCoreApplication - -# The following define makes your compiler emit warnings if you use -# any Qt feature that has been marked deprecated (the exact warnings -# depend on your compiler). Please consult the documentation of the -# deprecated API in order to know how to port your code away from it. -DEFINES += QT_DEPRECATED_WARNINGS - -# You can also make your code fail to compile if it uses deprecated APIs. -# In order to do so, uncomment the following line. -# You can also select to disable deprecated APIs only up to a certain version of Qt. -#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 - -HEADERS += \ - gpservice.h \ - sigwatch.h - -SOURCES += \ - gpservice.cpp \ - main.cpp \ - sigwatch.cpp - -DBUS_ADAPTORS += gpservice.xml - -# Default rules for deployment. -target.path = /usr/bin -INSTALLS += target - -DISTFILES += \ - dbus/com.yuezk.qt.GPService.conf \ - dbus/com.yuezk.qt.GPService.service \ - systemd/gpservice.service - -dbus_config.path = /usr/share/dbus-1/system.d/ -dbus_config.files = dbus/com.yuezk.qt.GPService.conf - -dbus_service.path = /usr/share/dbus-1/system-services/ -dbus_service.files = dbus/com.yuezk.qt.GPService.service - -systemd_service.path = /etc/systemd/system/ -systemd_service.files = systemd/gpservice.service - -INSTALLS += dbus_config dbus_service systemd_service diff --git a/GPService/gpservice.xml b/GPService/gpservice.xml deleted file mode 100644 index 9a9b8e8..0000000 --- a/GPService/gpservice.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/GlobalProtect-openconnect.pro b/GlobalProtect-openconnect.pro deleted file mode 100644 index 00483f6..0000000 --- a/GlobalProtect-openconnect.pro +++ /dev/null @@ -1,5 +0,0 @@ -TEMPLATE = subdirs - -SUBDIRS += \ - GPClient \ - GPService diff --git a/cmake/Add3rdParty.cmake b/cmake/Add3rdParty.cmake index b6f28b0..728c0ae 100644 --- a/cmake/Add3rdParty.cmake +++ b/cmake/Add3rdParty.cmake @@ -2,23 +2,16 @@ include(ExternalProject) function(add_3rdparty NAME) set(oneValueArgs GIT_REPOSITORY GIT_TAG) - cmake_parse_arguments(add_3rdparty_args "EXCLUDE_FROM_ALL" "${oneValueArgs}" "" ${ARGN}) + cmake_parse_arguments(add_3rdparty_args "${oneValueArgs}" "" ${ARGN}) if(EXISTS "${CMAKE_SOURCE_DIR}/3rdparty/${NAME}/CMakeLists.txt") message(STATUS "Found third party locally for ${NAME}") - if(${add_3rdparty_args_EXCLUDE_FROM_ALL}) - set(addSubdirectoryExtraArgs EXCLUDE_FROM_ALL) - else() - set(addSubdirectoryExtraArgs "") - endif() - ExternalProject_Add( ${NAME}-${PROJECT_NAME} PREFIX ${CMAKE_CURRENT_BINARY_DIR}/${NAME} SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdparty/${NAME}" INSTALL_COMMAND "" - ${addSubdirectoryExtraArgs} "${add_3rdparty_args_UNPARSED_ARGUMENTS}" ) return()