summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CMakeLists.txt27
-rw-r--r--INSTALL16
-rw-r--r--README21
-rw-r--r--tdenetworkmanager/CMakeLists.txt13
-rw-r--r--tdenetworkmanager/doc/CMakeLists.txt4
-rw-r--r--tdenetworkmanager/doc/man/CMakeLists.txt5
-rw-r--r--tdenetworkmanager/doc/man/tdenetworkmanager.1145
-rw-r--r--tdenetworkmanager/src/CMakeLists.txt3
-rw-r--r--tdenetworkmanager/src/configwidgets/CMakeLists.txt1
-rw-r--r--tdenetworkmanager/vpn-plugins/CMakeLists.txt8
-rw-r--r--tdenetworkmanager/vpn-plugins/openvpn/src/CMakeLists.txt3
-rw-r--r--tdenetworkmanager/vpn-plugins/pptp/src/CMakeLists.txt3
-rw-r--r--tdenetworkmanager/vpn-plugins/strongswan/src/CMakeLists.txt3
-rw-r--r--tdenetworkmanager/vpn-plugins/vpnc/src/CMakeLists.txt3
14 files changed, 221 insertions, 34 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d2ef19b..a2f1730 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 -UTQT_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 <caption>
+Use 'caption' as name in the titlebar
+.TP
+.B \-\-icon <icon>
+Use 'icon' as the application icon
+.TP
+.B \-\-miniicon <icon>
+Use 'icon' as the icon in the titlebar
+.TP
+.B \-\-config <filename>
+Use alternative configuration file
+.TP
+.B \-\-dcopserver <server>
+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 <style>
+sets the application GUI style
+.TP
+.B \-\-geometry <geometry>
+sets the client geometry of the main widget - see man X for the argument format
+.TP
+.B \-\-nofork
+Don't run in the background.
+.SS Qt options:
+.TP
+.B \-\-display <displayname>
+Use the X-server display 'displayname'
+.TP
+.B \-\-session <sessionId>
+Restore the application for the given 'sessionId'
+.TP
+.B \-\-cmap
+Causes the application to install a private color
+map on an 8-bit display
+.TP
+.B \-\-ncols <count>
+Limits the number of colors allocated in the color
+cube on an 8-bit display, if the application is
+using the QApplication::ManyColor color
+specification
+.TP
+.B \-\-nograb
+tells Qt to never grab the mouse or the keyboard
+.TP
+.B \-\-dograb
+running under a debugger can cause an implicit
+-nograb, use -dograb to override
+.TP
+.B \-\-sync
+switches to synchronous mode for debugging
+.TP
+.B \-\-fn, \-\-font <fontname>
+defines the application font
+.TP
+.B \-\-bg, \-\-background <color>
+sets the default background color and an
+application palette (light and dark shades are
+calculated)
+.TP
+.B \-\-fg, \-\-foreground <color>
+sets the default foreground color
+.TP
+.B \-\-btn, \-\-button <color>
+sets the default button color
+.TP
+.B \-\-name <name>
+sets the application name
+.TP
+.B \-\-title <title>
+sets the application title (caption)
+.TP
+.B \-\-visual TrueColor
+forces the application to use a TrueColor visual on
+an 8-bit display
+.TP
+.B \-\-inputstyle <inputstyle>
+sets XIM (X Input Method) input style. Possible
+values are onthespot, overthespot, offthespot and
+root
+.TP
+.B \-\-im <XIM server>
+set XIM server
+.TP
+.B \-\-noxim
+disable XIM
+.TP
+.B \-\-reverse
+mirrors the whole layout of widgets
+.SS
+
+.SH SEE ALSO
+.BR networkmanager (1)
+.SH AUTHORS
+.nf
+Timo Hoenig <thoenig@suse.de>
+.br
+Stefan Bogner <sbogner@suse.de>
+.br
+Will Stephenson <wstephenson@suse.de>
+.br
+
diff --git a/tdenetworkmanager/src/CMakeLists.txt b/tdenetworkmanager/src/CMakeLists.txt
index 58c4cb0..f56c7ee 100644
--- a/tdenetworkmanager/src/CMakeLists.txt
+++ b/tdenetworkmanager/src/CMakeLists.txt
@@ -9,8 +9,6 @@
#
#################################################
-add_definitions( -UTQT_NO_ASCII_CAST )
-
add_subdirectory( configwidgets )
include_directories(
@@ -23,7 +21,6 @@ include_directories(
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
${DBUS_TQT_INCLUDE_DIRS}
- ${NM_UTIL_INCLUDE_DIRS}
)
link_directories(
diff --git a/tdenetworkmanager/src/configwidgets/CMakeLists.txt b/tdenetworkmanager/src/configwidgets/CMakeLists.txt
index 8c9c32e..f75685f 100644
--- a/tdenetworkmanager/src/configwidgets/CMakeLists.txt
+++ b/tdenetworkmanager/src/configwidgets/CMakeLists.txt
@@ -18,7 +18,6 @@ include_directories(
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
${DBUS_TQT_INCLUDE_DIRS}
- ${NM_UTIL_INCLUDE_DIRS}
)
diff --git a/tdenetworkmanager/vpn-plugins/CMakeLists.txt b/tdenetworkmanager/vpn-plugins/CMakeLists.txt
index d5f6e8e..505cb5a 100644
--- a/tdenetworkmanager/vpn-plugins/CMakeLists.txt
+++ b/tdenetworkmanager/vpn-plugins/CMakeLists.txt
@@ -9,7 +9,7 @@
#
#################################################
-add_subdirectory( openvpn )
-add_subdirectory( pptp )
-add_subdirectory( strongswan )
-add_subdirectory( vpnc )
+tde_conditional_add_subdirectory( WITH_OPENVPN openvpn )
+tde_conditional_add_subdirectory( WITH_PPTP pptp )
+tde_conditional_add_subdirectory( WITH_VPNC vpnc )
+tde_conditional_add_subdirectory( WITH_STRONGSWAN strongswan )
diff --git a/tdenetworkmanager/vpn-plugins/openvpn/src/CMakeLists.txt b/tdenetworkmanager/vpn-plugins/openvpn/src/CMakeLists.txt
index 2753f8b..c422bce 100644
--- a/tdenetworkmanager/vpn-plugins/openvpn/src/CMakeLists.txt
+++ b/tdenetworkmanager/vpn-plugins/openvpn/src/CMakeLists.txt
@@ -9,8 +9,6 @@
#
#################################################
-add_definitions( -UTQT_NO_ASCII_CAST )
-
include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}
@@ -20,7 +18,6 @@ include_directories(
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
${DBUS_TQT_INCLUDE_DIRS}
- ${NM_UTIL_INCLUDE_DIRS}
)
link_directories(
diff --git a/tdenetworkmanager/vpn-plugins/pptp/src/CMakeLists.txt b/tdenetworkmanager/vpn-plugins/pptp/src/CMakeLists.txt
index e2b9acb..e744b2e 100644
--- a/tdenetworkmanager/vpn-plugins/pptp/src/CMakeLists.txt
+++ b/tdenetworkmanager/vpn-plugins/pptp/src/CMakeLists.txt
@@ -9,8 +9,6 @@
#
#################################################
-add_definitions( -UTQT_NO_ASCII_CAST )
-
include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}
@@ -20,7 +18,6 @@ include_directories(
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
${DBUS_TQT_INCLUDE_DIRS}
- ${NM_UTIL_INCLUDE_DIRS}
)
link_directories(
diff --git a/tdenetworkmanager/vpn-plugins/strongswan/src/CMakeLists.txt b/tdenetworkmanager/vpn-plugins/strongswan/src/CMakeLists.txt
index a521c94..5973982 100644
--- a/tdenetworkmanager/vpn-plugins/strongswan/src/CMakeLists.txt
+++ b/tdenetworkmanager/vpn-plugins/strongswan/src/CMakeLists.txt
@@ -9,8 +9,6 @@
#
#################################################
-add_definitions( -UTQT_NO_ASCII_CAST )
-
include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}
@@ -20,7 +18,6 @@ include_directories(
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
${DBUS_TQT_INCLUDE_DIRS}
- ${NM_UTIL_INCLUDE_DIRS}
)
link_directories(
diff --git a/tdenetworkmanager/vpn-plugins/vpnc/src/CMakeLists.txt b/tdenetworkmanager/vpn-plugins/vpnc/src/CMakeLists.txt
index 9c397d8..69e9b91 100644
--- a/tdenetworkmanager/vpn-plugins/vpnc/src/CMakeLists.txt
+++ b/tdenetworkmanager/vpn-plugins/vpnc/src/CMakeLists.txt
@@ -9,8 +9,6 @@
#
#################################################
-add_definitions( -UTQT_NO_ASCII_CAST )
-
include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}
@@ -20,7 +18,6 @@ include_directories(
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
${DBUS_TQT_INCLUDE_DIRS}
- ${NM_UTIL_INCLUDE_DIRS}
)
link_directories(
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-26 03:32:27 +0000