conversion to the cmake building system

Signed-off-by: gregory guy <[email protected]>
(cherry picked from commit 67025db14ed3496a7977682e1c5c282e630abc4e)

7 files changed, 59 insertions, 9 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
new file mode 100644
index 0000000..61fc2de
--- /dev/null
+++ b/src/CMakeLists.txt
@@ -0,0 +1,46 @@
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${TDE_INCLUDE_DIR}/tde
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### kcm_ldapmanager (kpart)
+
+tde_add_kpart( kcm_ldapmanager AUTOMOC
+
+  SOURCES
+        ldapconfigbase.ui
+        userconfigbase.ui
+        groupconfigbase.ui
+        machineconfigbase.ui
+        serviceconfigbase.ui
+        ldapmgr.cpp
+        userconfigdlg.cpp
+        groupconfigdlg.cpp
+        machineconfigdlg.cpp
+        serviceconfigdlg.cpp
+  LINK
+     tdeio-shared
+     tdeui-shared
+     ${LDAP_LIBRARIES}
+     ${TDELDAP_LIBRARIES}
+
+  DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### other data
+
+install(
+    FILES ldapmanager.desktop
+    DESTINATION ${XDG_APPS_INSTALL_DIR}
+)
diff --git a/src/groupconfigdlg.h b/src/groupconfigdlg.h
index dc51337..1c70d58 100644
--- a/src/groupconfigdlg.h
+++ b/src/groupconfigdlg.h
@@ -23,7 +23,7 @@
 
 #include <kdialogbase.h>
 
-#include "libtdeldap.h"
+#include <libtdeldap.h>
 #include "groupconfigbase.h"
 
 class GroupConfigDialog : public KDialogBase
diff --git a/src/ldapmgr.cpp b/src/ldapmgr.cpp
index 3d7e581..0702ee7 100644
--- a/src/ldapmgr.cpp
+++ b/src/ldapmgr.cpp
@@ -44,16 +44,16 @@
 
 #include "ldapmgr.h"
 
-#include "libtdeldap.h"
-#include "ldappasswddlg.h"
+#include <libtdeldap.h>
+#include <ldappasswddlg.h>
 #include "userconfigdlg.h"
 #include "groupconfigdlg.h"
 #include "machineconfigdlg.h"
 #include "serviceconfigdlg.h"
 
-// FIXME
-// Connect this to CMake/Automake
+#ifndef KDE_CONFDIR
 #define KDE_CONFDIR "/etc/trinity"
+#endif
 
 typedef KGenericFactory<LDAPConfig, TQWidget> LDAPConfigFactory;
 
@@ -921,3 +921,5 @@ TQString LDAPConfig::quickHelp() const
 {
 	return i18n("This module manages users, groups, and machines in LDAP realms.");
 }
+
+#include "ldapmgr.moc"
diff --git a/src/ldapmgr.h b/src/ldapmgr.h
index 48fe954..c3ef9b0 100644
--- a/src/ldapmgr.h
+++ b/src/ldapmgr.h
@@ -30,7 +30,7 @@
 #include <tqpushbutton.h>
 #include <tqcombobox.h>
 
-#include "libtdeldap.h"
+#include <libtdeldap.h>
 #include "ldapconfigbase.h"
 
 class KSimpleConfig;
diff --git a/src/machineconfigdlg.h b/src/machineconfigdlg.h
index 25f2554..68c2b3d 100644
--- a/src/machineconfigdlg.h
+++ b/src/machineconfigdlg.h
@@ -23,7 +23,7 @@
 
 #include <kdialogbase.h>
 
-#include "libtdeldap.h"
+#include <libtdeldap.h>
 #include "machineconfigbase.h"
 
 class MachineConfigDialog : public KDialogBase
diff --git a/src/serviceconfigdlg.h b/src/serviceconfigdlg.h
index 5ebf5a1..85736bd 100644
--- a/src/serviceconfigdlg.h
+++ b/src/serviceconfigdlg.h
@@ -23,7 +23,7 @@
 
 #include <kdialogbase.h>
 
-#include "libtdeldap.h"
+#include <libtdeldap.h>
 #include "serviceconfigbase.h"
 
 class ServiceConfigDialog : public KDialogBase
diff --git a/src/userconfigdlg.h b/src/userconfigdlg.h
index de5be1c..8e0c0d9 100644
--- a/src/userconfigdlg.h
+++ b/src/userconfigdlg.h
@@ -23,10 +23,12 @@
 
 #include <kdialogbase.h>
 
-#include "libtdeldap.h"
+#include <libtdeldap.h>
 #include "userconfigbase.h"
 
+#ifndef AVAILABLE_SHELLS
 #define AVAILABLE_SHELLS "/bin/bash /bin/sh /bin/dash /bin/rbash /usr/bin/screen"
+#endif
 
 class UserConfigDialog : public KDialogBase
 {