summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2018-08-25 13:46:19 +0200
committerSlávek Banko <slavek.banko@axis.cz>2018-09-01 19:02:11 +0200
commit33423a846944b30830d67898dd97493f0e1844c0 (patch)
tree3f924b3dafe28c1486265d9c20aa0f653576780a
parent80655e593a25a225af026bb535e1b81eda926652 (diff)
downloadtdeadmin-33423a846944b30830d67898dd97493f0e1844c0.tar.gz
tdeadmin-33423a846944b30830d67898dd97493f0e1844c0.zip
cmake kuser: Remove the ldap library linking
Signed-off-by: Slávek Banko <slavek.banko@axis.cz> (cherry picked from commit 78e39d59137bcfe1a90e53e8f4c0342d8e0939fd)
-rw-r--r--ConfigureChecks.cmake14
-rw-r--r--kuser/CMakeLists.txt2
2 files changed, 10 insertions, 6 deletions
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index 27bd908..b5f556f 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -6,6 +6,15 @@
#
#################################################
+# required stuff
+find_package( TQt )
+find_package( TDE )
+
+tde_setup_architecture_flags( )
+
+
+##### check for gcc visibility support #########
+
if( WITH_GCC_VISIBILITY )
if( NOT UNIX )
tde_message_fatal( "gcc visibility support was requested, but your system is not *NIX" )
@@ -16,8 +25,6 @@ if( WITH_GCC_VISIBILITY )
endif( WITH_GCC_VISIBILITY )
-tde_setup_architecture_flags( )
-
#### check for headers
check_include_file( "unistd.h" HAVE_UNISTD_H )
check_include_file( "sys/stat.h" HAVE_SYS_STAT_H )
@@ -55,6 +62,3 @@ check_include_file( "sys/stropts.h" HAVE_SYS_STROPTS_H )
check_include_file( "sys/time.h" HAVE_SYS_TIME_H )
check_include_file( "sys/types.h" HAVE_SYS_TYPES_H )
-# required stuff
-find_package( TQt )
-find_package( TDE )
diff --git a/kuser/CMakeLists.txt b/kuser/CMakeLists.txt
index a85c326..a5cf2a9 100644
--- a/kuser/CMakeLists.txt
+++ b/kuser/CMakeLists.txt
@@ -29,7 +29,7 @@ tde_add_executable( kuser AUTOMOC
kgroupsystem.cpp selectconn.cpp sha1.cpp kuserprefs.kcfgc filessettings.ui
generalsettings.ui ldapsettings.ui ldapsamba.ui passwordpolicy.ui
LINK tdecore-shared tdeui-shared tdeio-shared tdeui-shared DCOP-shared tdefx
- tdetexteditor crypt tdeabc_ldaptdeio tdeabc ldap tdentlm
+ tdetexteditor crypt tdeabc_ldaptdeio tdeabc tdentlm
DESTINATION ${BIN_INSTALL_DIR}
)