From 6d8d495faf0a8670d1657ec4dc0fb84f3e3d249a Mon Sep 17 00:00:00 2001
From: gregory guy <g-gregory@gmx.fr>
Date: Sat, 12 Jan 2019 17:06:36 +0100
Subject: conversion to the cmake building system

Signed-off-by: gregory guy <g-gregory@gmx.fr>
---
 src/CMakeLists.txt   | 43 +++++++++++++++++++++++++++++++++++++++++++
 src/ldaplogindlg.cpp |  2 +-
 src/libtdeldap.cpp   | 17 +++++++++--------
 3 files changed, 53 insertions(+), 9 deletions(-)
 create mode 100644 src/CMakeLists.txt

(limited to 'src')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
new file mode 100644
index 0000000..a8db41b
--- /dev/null
+++ b/src/CMakeLists.txt
@@ -0,0 +1,43 @@
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}/tde
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${KRB5_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### tdeldap (shared)
+
+tde_add_library( tdeldap SHARED AUTOMOC
+
+  SOURCES
+        libtdeldap.cpp
+        ldaplogindlgbase.ui
+        ldaplogindlg.cpp
+        ldappasswddlg.cpp
+  LINK
+     tdeui-shared
+     tdecore-shared
+     tdeio-shared
+     tdesu
+     krb5 kadm5clnt kadm5srv hdb lber 
+     ldap
+     
+  DESTINATION ${LIB_INSTALL_DIR}
+) 
+
+
+##### headers
+
+install(
+    FILES ldappasswddlg.h libtdeldap.h
+    DESTINATION ${INCLUDE_INSTALL_DIR}
+)
diff --git a/src/ldaplogindlg.cpp b/src/ldaplogindlg.cpp
index 5a5acd1..458c0d9 100644
--- a/src/ldaplogindlg.cpp
+++ b/src/ldaplogindlg.cpp
@@ -43,4 +43,4 @@ LDAPLogin::~LDAPLogin(){
 	// 
 }
 
-// #include "ldaplogindlg.moc"
+#include "ldaplogindlg.moc"
diff --git a/src/libtdeldap.cpp b/src/libtdeldap.cpp
index f0e5389..236f307 100644
--- a/src/libtdeldap.cpp
+++ b/src/libtdeldap.cpp
@@ -88,13 +88,13 @@ extern "C" {
 #define LDAP_INSECURE_PORT 389
 #define LDAP_SECURE_PORT 636
 
-// FIXME
-// Connect this to CMake/Automake
+#ifndef KDE_CONFDIR
 #define KDE_CONFDIR "/etc/trinity"
+#endif
 
-// FIXME
-// This assumes Debian!
+#ifndef KRB5_FILE
 #define KRB5_FILE "/etc/krb5.conf"
+#endif
 
 //#define KRB5_ANK_RANDOM_PASSWORD_LENGTH 1024
 #define KRB5_ANK_RANDOM_PASSWORD_LENGTH 512
@@ -120,14 +120,15 @@ extern "C" {
 #define CRON_UPDATE_NSS_FILE "/etc/cron.daily/upd-local-nss-db"
 #define CRON_UPDATE_NSS_COMMAND "/usr/sbin/nss_updatedb ldap"
 
-// FIXME
-// This assumes Debian!
+#ifndef SYSTEM_CA_STORE_CERT_LOCATION
 #define SYSTEM_CA_STORE_CERT_LOCATION "/usr/local/share/ca-certificates/"
+#endif
+
 #define SYSTEM_CA_STORE_REGENERATE_COMMAND "update-ca-certificates"
 
-// FIXME
-// This assumes Debian!
+#ifndef CRON_UPDATE_PRIMARY_REALM_CERTIFICATES_OPENLDAP_RELOAD_COMMAND
 #define CRON_UPDATE_PRIMARY_REALM_CERTIFICATES_OPENLDAP_RELOAD_COMMAND "/etc/init.d/slapd force-reload"
+#endif
 
 int requested_ldap_version = LDAP_VERSION3;
 char* ldap_user_and_operational_attributes[2] = {"*", "+"};
-- 
cgit v1.2.3