From 9c839f7a338e6dd6279d83a7e4c2ab1e307aaf30 Mon Sep 17 00:00:00 2001 From: gregory guy Date: Tue, 22 Oct 2019 16:31:59 +0200 Subject: [PATCH] Update the cmake build system, see issue #2 (some cleanup) Add a man page taken from the Debian packaging system. Add README and Install file with basic description as well as basic build instructions with cmake. Signed-off-by: gregory guy (cherry picked from commit 774770240a49afa8438da1261ad62eb79d1c8ddd) --- CMakeLists.txt | 27 ++-- INSTALL | 16 ++ README | 21 +++ tdenetworkmanager/CMakeLists.txt | 13 +- tdenetworkmanager/doc/CMakeLists.txt | 4 +- tdenetworkmanager/doc/man/CMakeLists.txt | 5 + tdenetworkmanager/doc/man/tdenetworkmanager.1 | 145 ++++++++++++++++++ tdenetworkmanager/src/CMakeLists.txt | 3 - .../src/configwidgets/CMakeLists.txt | 1 - tdenetworkmanager/vpn-plugins/CMakeLists.txt | 8 +- .../vpn-plugins/openvpn/src/CMakeLists.txt | 3 - .../vpn-plugins/pptp/src/CMakeLists.txt | 3 - .../vpn-plugins/strongswan/src/CMakeLists.txt | 3 - .../vpn-plugins/vpnc/src/CMakeLists.txt | 3 - 14 files changed, 221 insertions(+), 34 deletions(-) create mode 100644 INSTALL create mode 100644 README create mode 100644 tdenetworkmanager/doc/man/CMakeLists.txt create mode 100644 tdenetworkmanager/doc/man/tdenetworkmanager.1 diff --git a/CMakeLists.txt b/CMakeLists.txt index d2ef19b..e4e0f86 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,8 +20,12 @@ set( TDENETWORKMANAGER_VERSION "0.9" ) ##### include essential cmake modules ########### -include( FindPkgConfig ) -include( CheckSymbolExists ) +include( FindPkgConfig ) +include( CheckFunctionExists ) +include( CheckSymbolExists ) +include( CheckIncludeFile ) +include( CheckLibraryExists ) +include( CheckCSourceCompiles ) include( CheckCXXSourceCompiles ) @@ -43,14 +47,21 @@ endif( ) ##### optional stuff ############################ +option( WITH_ALL_OPTIONS "Enable all optional support" OFF ) +option( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden" OFF ) +option( WITH_OPENVPN "Enable openvpn support" ${WITH_ALL_OPTIONS} ) +option( WITH_PPTP "Enable pptp support" ${WITH_ALL_OPTIONS} ) +option( WITH_VPNC "Enable vpnc support" ${WITH_ALL_OPTIONS} ) +option( WITH_STRONGSWAN "Enable strongswan support" ${WITH_ALL_OPTIONS} ) + # option( WITH_LDAP "Enable LDAP support" OFF ) ##### user requested modules #################### -option( BUILD_ALL "Build all" ON ) -option( BUILD_DOC "Build documentation" ${BUILD_ALL} ) -option( BUILD_TRANSLATIONS "Build translations" ${BUILD_ALL} ) +option( BUILD_ALL "Build all" OFF ) +option( BUILD_DOC "Build documentation" ${BUILD_ALL} ) +option( BUILD_TRANSLATIONS "Build translations" ${BUILD_ALL} ) ##### configure checks ########################## @@ -60,9 +71,7 @@ include( ConfigureChecks.cmake ) ###### global compiler settings ################# -add_definitions( - -DHAVE_CONFIG_H -) +add_definitions( -DHAVE_CONFIG_H -UQT_NO_ASCII_CAST ) set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TQT_CXX_FLAGS}" ) set( CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined" ) @@ -71,7 +80,7 @@ set( CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--no-undefined" ##### source directories ######################## -add_subdirectory( tdenetworkmanager ) +add_subdirectory( ${PROJECT_NAME} ) ##### write configure files ##################### diff --git a/INSTALL b/INSTALL new file mode 100644 index 0000000..fd2c77f --- /dev/null +++ b/INSTALL @@ -0,0 +1,16 @@ +Basic Installation +================== + +Tdenetworkmanager relies on cmake to build. + +Here are suggested default options: + + -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ + -DCONFIG_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DBUILD_ALL="ON" \ + -DWITH_ALL_OPTIONS="ON" diff --git a/README b/README new file mode 100644 index 0000000..8bd2c11 --- /dev/null +++ b/README @@ -0,0 +1,21 @@ + +tdenetworkmanager - a TDE systray applet for controlling networking + + +Tdenetworkmanager is a systray applet for controlling network +connections managed by a TDE network backend. It is mainly written for +the Trinity Desktop Environment but also works for other desktop +environments like GNOME or Xfce. + + + + CONTRIBUTING +============== + +If you wish to contribute to Knetstats (TDE), you might do so: + +- TDE Gitea Workspace (TGW) collaboration tool. + https://mirror.git.trinitydesktop.org/gitea + +- TDE Weblate Translation Workspace (TWTW) collaboration tool. + https://mirror.git.trinitydesktop.org/weblate diff --git a/tdenetworkmanager/CMakeLists.txt b/tdenetworkmanager/CMakeLists.txt index 6335273..fe9e64a 100644 --- a/tdenetworkmanager/CMakeLists.txt +++ b/tdenetworkmanager/CMakeLists.txt @@ -9,10 +9,15 @@ # ################################################# -tde_conditional_add_subdirectory( BUILD_DOC doc ) + add_subdirectory( pics ) -add_subdirectory( src ) +add_subdirectory( src ) add_subdirectory( vpn-plugins ) -tde_conditional_add_subdirectory( BUILD_TRANSLATIONS po ) +tde_conditional_add_subdirectory( BUILD_DOC doc ) +tde_conditional_add_subdirectory( BUILD_TRANSLATIONS po ) + -install( FILES tdenetworkmanager.conf DESTINATION ${DBUS_SYS_DIR} ) +install( + FILES tdenetworkmanager.conf + DESTINATION ${DBUS_SYS_DIR} +) diff --git a/tdenetworkmanager/doc/CMakeLists.txt b/tdenetworkmanager/doc/CMakeLists.txt index 720c626..76a3432 100644 --- a/tdenetworkmanager/doc/CMakeLists.txt +++ b/tdenetworkmanager/doc/CMakeLists.txt @@ -6,4 +6,6 @@ # ################################################# -tde_create_handbook( DESTINATION tdenetworkmanager ) +add_subdirectory( man ) + +tde_create_handbook( DESTINATION ${PROJECT_NAME} ) diff --git a/tdenetworkmanager/doc/man/CMakeLists.txt b/tdenetworkmanager/doc/man/CMakeLists.txt new file mode 100644 index 0000000..8512250 --- /dev/null +++ b/tdenetworkmanager/doc/man/CMakeLists.txt @@ -0,0 +1,5 @@ +INSTALL( + FILES ${PROJECT_NAME}.1 + DESTINATION ${MAN_INSTALL_DIR}/man1 + COMPONENT doc +) diff --git a/tdenetworkmanager/doc/man/tdenetworkmanager.1 b/tdenetworkmanager/doc/man/tdenetworkmanager.1 new file mode 100644 index 0000000..0f1abef --- /dev/null +++ b/tdenetworkmanager/doc/man/tdenetworkmanager.1 @@ -0,0 +1,145 @@ +.\" This file was generated by kdemangen.pl +.TH TDENETWORKMANAGER 1 "Feb 2006" "Trinity Desktop Environment" "A NetworkManager front-end for TDE" +.SH NAME +tdenetworkmanager +\- A NetworkManager front-end for TDE +.SH SYNOPSIS +tdenetworkmanager [Qt\-options] [TDE\-options] +.SH DESCRIPTION +A NetworkManager front-end for TDE +.SH OPTIONS +.SS Generic options: +.TP +.B \-\-help +Show help about options +.TP +.B \-\-help\-qt +Show Qt specific options +.TP +.B \-\-help\-tde +Show TDE specific options +.TP +.B \-\-help\-all +Show all options +.TP +.B \-\-author +Show author information +.TP +.B \-v, \-\-version +Show version information +.TP +.B \-\-license +Show license information +.TP +.B \-\- +End of options +.SS +.SS TDE options: +.TP +.B \-\-caption +Use 'caption' as name in the titlebar +.TP +.B \-\-icon +Use 'icon' as the application icon +.TP +.B \-\-miniicon +Use 'icon' as the icon in the titlebar +.TP +.B \-\-config +Use alternative configuration file +.TP +.B \-\-dcopserver +Use the DCOP Server specified by 'server' +.TP +.B \-\-nocrashhandler +Disable crash handler, to get core dumps +.TP +.B \-\-waitforwm +Waits for a WM_NET compatible windowmanager +.TP +.B \-\-style