Port examples to the new build system

16 files changed, 28 insertions, 114 deletions

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
new file mode 100644
index 00000000..0d026cff
--- /dev/null
+++ b/examples/CMakeLists.txt
@@ -0,0 +1,20 @@
+macro(add_simple_example EXAMPLE_NAME)
+    add_executable(${EXAMPLE_NAME} example_${EXAMPLE_NAME}/example_${EXAMPLE_NAME}.cpp)
+    target_link_libraries(${EXAMPLE_NAME} qxmpp)
+endmacro()
+
+include_directories(../src/base)
+include_directories(../src/client)
+include_directories(../src/server)
+
+add_simple_example(0_connected)
+add_simple_example(1_echoClient)
+add_simple_example(2_rosterHandling)
+add_simple_example(3_transferHandling)
+add_simple_example(7_archiveHandling)
+add_simple_example(8_server)
+
+add_subdirectory(example_5_rpcInterface)
+add_subdirectory(example_6_rpcClient)
+add_subdirectory(example_9_vCard)
+
diff --git a/examples/example_0_connected/example_0_connected.pro b/examples/example_0_connected/example_0_connected.pro
deleted file mode 100644
index fcb74477..00000000
--- a/examples/example_0_connected/example_0_connected.pro
+++ /dev/null
@@ -1,7 +0,0 @@
-include(../examples.pri)
-
-TARGET = example_0_connected
-
-SOURCES += example_0_connected.cpp
-
-OTHER_FILES += README
diff --git a/examples/example_1_echoClient/example_1_echoClient.pro b/examples/example_1_echoClient/example_1_echoClient.pro
deleted file mode 100644
index 8a39a64a..00000000
--- a/examples/example_1_echoClient/example_1_echoClient.pro
+++ /dev/null
@@ -1,9 +0,0 @@
-include(../examples.pri)
-
-TARGET = example_1_echoClient
-
-SOURCES += example_1_echoClient.cpp
-
-HEADERS += example_1_echoClient.h
-
-OTHER_FILES += README
diff --git a/examples/example_2_rosterHandling/example_2_rosterHandling.pro b/examples/example_2_rosterHandling/example_2_rosterHandling.pro
deleted file mode 100644
index c9c886f9..00000000
--- a/examples/example_2_rosterHandling/example_2_rosterHandling.pro
+++ /dev/null
@@ -1,9 +0,0 @@
-include(../examples.pri)
-
-TARGET = example_2_rosterHandling
-
-SOURCES += example_2_rosterHandling.cpp
-
-HEADERS += example_2_rosterHandling.h
-
-OTHER_FILES += README
diff --git a/examples/example_3_transferHandling/example_3_transferHandling.pro b/examples/example_3_transferHandling/example_3_transferHandling.pro
deleted file mode 100644
index 73370a03..00000000
--- a/examples/example_3_transferHandling/example_3_transferHandling.pro
+++ /dev/null
@@ -1,9 +0,0 @@
-include(../examples.pri)
-
-TARGET = example_3_transferHandling
-
-RESOURCES += example_3_transferHandling.qrc
-
-SOURCES += example_3_transferHandling.cpp
-
-HEADERS += example_3_transferHandling.h
diff --git a/examples/example_5_rpcInterface/CMakeLists.txt b/examples/example_5_rpcInterface/CMakeLists.txt
new file mode 100644
index 00000000..40f014ef
--- /dev/null
+++ b/examples/example_5_rpcInterface/CMakeLists.txt
@@ -0,0 +1,2 @@
+add_executable(5_rpcInterface main.cpp remoteinterface.cpp)
+target_link_libraries(5_rpcInterface qxmpp)
diff --git a/examples/example_5_rpcInterface/example_5_rpcInterface.pro b/examples/example_5_rpcInterface/example_5_rpcInterface.pro
deleted file mode 100644
index ab50fdfd..00000000
--- a/examples/example_5_rpcInterface/example_5_rpcInterface.pro
+++ /dev/null
@@ -1,10 +0,0 @@
-include(../examples.pri)
-
-TARGET = example_5_rpcInterface
-
-SOURCES += main.cpp \
-           remoteinterface.cpp
-
-HEADERS += remoteinterface.h
-
-OTHER_FILES += README
diff --git a/examples/example_6_rpcClient/CMakeLists.txt b/examples/example_6_rpcClient/CMakeLists.txt
new file mode 100644
index 00000000..d3b10b92
--- /dev/null
+++ b/examples/example_6_rpcClient/CMakeLists.txt
@@ -0,0 +1,2 @@
+add_executable(6_rpcClient main.cpp rpcClient.cpp)
+target_link_libraries(6_rpcClient qxmpp)
diff --git a/examples/example_6_rpcClient/example_6_rpcClient.pro b/examples/example_6_rpcClient/example_6_rpcClient.pro
deleted file mode 100644
index 0f642962..00000000
--- a/examples/example_6_rpcClient/example_6_rpcClient.pro
+++ /dev/null
@@ -1,10 +0,0 @@
-include(../examples.pri)
-
-TARGET = example_6_rpcClient
-
-SOURCES += main.cpp \
-           rpcClient.cpp 
-
-HEADERS += rpcClient.h 
-
-OTHER_FILES += README
diff --git a/examples/example_7_archiveHandling/example_7_archiveHandling.pro b/examples/example_7_archiveHandling/example_7_archiveHandling.pro
deleted file mode 100644
index fc80314a..00000000
--- a/examples/example_7_archiveHandling/example_7_archiveHandling.pro
+++ /dev/null
@@ -1,7 +0,0 @@
-include(../examples.pri)
-
-TARGET = example_7_archiveHandling
-
-SOURCES += example_7_archiveHandling.cpp
-
-HEADERS += example_7_archiveHandling.h
diff --git a/examples/example_8_server/main.cpp b/examples/example_8_server/example_8_server.cpp
index e28f1de5..e28f1de5 100644
--- a/examples/example_8_server/main.cpp
+++ b/examples/example_8_server/example_8_server.cpp
diff --git a/examples/example_8_server/example_8_server.pro b/examples/example_8_server/example_8_server.pro
deleted file mode 100644
index d8013ef5..00000000
--- a/examples/example_8_server/example_8_server.pro
+++ /dev/null
@@ -1,5 +0,0 @@
-include(../examples.pri)
-
-TARGET = example_8_server
-
-SOURCES +=  main.cpp
diff --git a/examples/example_9_vCard/CMakeLists.txt b/examples/example_9_vCard/CMakeLists.txt
new file mode 100644
index 00000000..8b4a95c9
--- /dev/null
+++ b/examples/example_9_vCard/CMakeLists.txt
@@ -0,0 +1,4 @@
+find_package(Qt5 REQUIRED COMPONENTS Gui)
+
+add_executable(9_vCard example_9_vCard.cpp)
+target_link_libraries(9_vCard Qt5::Gui qxmpp)
diff --git a/examples/example_9_vCard/example_9_vCard.pro b/examples/example_9_vCard/example_9_vCard.pro
deleted file mode 100644
index 4ecdc816..00000000
--- a/examples/example_9_vCard/example_9_vCard.pro
+++ /dev/null
@@ -1,7 +0,0 @@
-include(../examples.pri)
-
-TARGET = example_9_vCard
-
-SOURCES += example_9_vCard.cpp
-
-HEADERS += example_9_vCard.h
diff --git a/examples/examples.pri b/examples/examples.pri
deleted file mode 100644
index 973473db..00000000
--- a/examples/examples.pri
+++ /dev/null
@@ -1,25 +0,0 @@
-include(../qxmpp.pri)
-
-TEMPLATE = app
-CONFIG += console
-
-QMAKE_LIBDIR += ../../src
-QMAKE_RPATHDIR += $$OUT_PWD/../../src
-INCLUDEPATH += $$QXMPP_INCLUDEPATH
-LIBS += $$QXMPP_LIBS
-
-# Symbian packaging rules
-symbian {
-    vendorinfo = \
-        "; Localised Vendor name" \
-        "%{\"QXmpp\"}" \
-        " " \
-        "; Unique Vendor name" \
-        ":\"QXmpp\"" \
-        " "
-
-    examples_deployment.pkg_prerules += vendorinfo
-    DEPLOYMENT += examples_deployment
-
-    TARGET.CAPABILITY = "NetworkServices"
-}
diff --git a/examples/examples.pro b/examples/examples.pro
deleted file mode 100644
index 9ca216ef..00000000
--- a/examples/examples.pro
+++ /dev/null
@@ -1,16 +0,0 @@
-include(../qxmpp.pri)
-
-TEMPLATE = subdirs
-
-SUBDIRS = example_0_connected \
-          example_1_echoClient \
-          example_2_rosterHandling \
-          example_3_transferHandling \
-#          example_4_callHandling \
-          example_5_rpcInterface \
-          example_6_rpcClient \
-          example_7_archiveHandling \
-          example_8_server \
-          example_9_vCard
-#          GuiClient
-