From 7fefe15989a08e255ade5e577c781701b157d430 Mon Sep 17 00:00:00 2001 From: gregory guy Date: Tue, 20 Oct 2020 14:40:51 +0200 Subject: Conversion to the cmake building system. Signed-off-by: gregory guy (cherry picked from commit 81b64bcfc0a32fdeb0e4f367adbf273d924e55f4) --- src/tor_ioslave/CMakeLists.txt | 34 ++++++++++++++++++++++++++++++++++ src/tor_ioslave/torioslave.cpp | 24 ++++++++++++------------ src/tor_ioslave/torioslave.h | 4 ++-- 3 files changed, 48 insertions(+), 14 deletions(-) create mode 100644 src/tor_ioslave/CMakeLists.txt (limited to 'src/tor_ioslave') diff --git a/src/tor_ioslave/CMakeLists.txt b/src/tor_ioslave/CMakeLists.txt new file mode 100644 index 0000000..922f0a1 --- /dev/null +++ b/src/tor_ioslave/CMakeLists.txt @@ -0,0 +1,34 @@ +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + + +##### tdeio_torioslave (kpart) + +tde_add_kpart( tdeio_torioslave AUTOMOC + + SOURCES + torioslave.cpp + LINK + tdecore-shared + tdeio-shared + + DESTINATION ${PLUGIN_INSTALL_DIR} +) + + +##### other data + +tde_create_translated_desktop( + SOURCE torioslave.protocol + DESTINATION ${SERVICES_INSTALL_DIR} +) diff --git a/src/tor_ioslave/torioslave.cpp b/src/tor_ioslave/torioslave.cpp index 1c1e875..c3fc8b0 100644 --- a/src/tor_ioslave/torioslave.cpp +++ b/src/tor_ioslave/torioslave.cpp @@ -19,18 +19,10 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include #include #include @@ -48,6 +40,14 @@ #include #include +#include +#include +#include +#include +#include +#include +#include + #include "torioslave.h" using namespace TDEIO; diff --git a/src/tor_ioslave/torioslave.h b/src/tor_ioslave/torioslave.h index 5668e3f..ab0efb3 100644 --- a/src/tor_ioslave/torioslave.h +++ b/src/tor_ioslave/torioslave.h @@ -22,8 +22,8 @@ #ifndef _tor_H_ #define _tor_H_ -#include -#include +#include +#include #include #include -- cgit v1.2.1