X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=CMakeLists.txt;h=2e743749f97d283f7db1dd8b052c640ed593f142;hb=f77a0b720ed58a2b68876b9320742b81b6df871f;hp=791ecb4f35ad399a710bd9ed940c3c7e15eb90c1;hpb=11a1e4372551439769eafba3f3f5403adff763fb;p=quassel.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 791ecb4f..2e743749 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,13 +40,13 @@ include(QuasselMacros)
 # Options and variables that can be set on the command line
 #####################################################################
 
-# First, choose a Qt version. We support USE_QT4 and USE_QT5; if neither is set, prefer Qt4 for now
-option(USE_QT5 "Enable support for Qt5 (disables KDE integration)" OFF)
-if (USE_QT4) # takes precedence
-    set(USE_QT5 OFF)
+# First, choose a Qt version. We support USE_QT5 and USE_QT4; if neither is set, Qt5 will be used
+option(USE_QT5 "Enable support for Qt5" OFF)
+if (USE_QT5) # takes precedence
+    set(USE_QT4 OFF)
 else()
-    if (NOT USE_QT5)
-        set(USE_QT4 ON)
+    if (NOT USE_QT4)
+        set(USE_QT5 ON)
     endif()
 endif()
 
@@ -70,13 +70,13 @@ else()
     add_feature_info(WITH_KDE WITH_KDE "Integrate with the KDE Frameworks runtime environment")
 endif()
 
-cmake_dependent_option(WITH_OXYGEN "Install Oxygen icon set (usually shipped with KDE)" ON "NOT WITH_KDE" OFF)
-cmake_dependent_option(WITH_BREEZE "Install Breeze icon set (usually shipped with KDE)" OFF "NOT WITH_KDE" OFF)
-cmake_dependent_option(WITH_BREEZE_DARK "Install Dark Breeze icon set (usually shipped with KDE)" OFF "NOT WITH_KDE" OFF)
+cmake_dependent_option(WITH_BREEZE "Install Breeze icon theme (usually shipped with KDE)" ON "NOT WITH_KDE" OFF)
+cmake_dependent_option(WITH_BREEZE_DARK "Install Dark Breeze icon theme (usually shipped with KDE)" OFF "NOT WITH_KDE" OFF)
+cmake_dependent_option(WITH_OXYGEN "Install Oxygen icon theme (usually shipped with KDE)" OFF "NOT WITH_KDE" OFF)
 if (NOT WITH_KDE)
-    add_feature_info(WITH_OXYGEN WITH_OXYGEN "Install Oxygen icon set")
-    add_feature_info(WITH_BREEZE WITH_BREEZE "Install Breeze icon set. Alternative to Oxygen.")
-    add_feature_info(WITH_BREEZE_DARK WITH_BREEZE_DARK "Install Dark Breeze icon set. Alternative to Oxygen.")
+    add_feature_info(WITH_BREEZE WITH_BREEZE "Install Breeze icon theme")
+    add_feature_info(WITH_BREEZE_DARK WITH_BREEZE_DARK "Install Dark Breeze icon theme")
+    add_feature_info(WITH_OXYGEN WITH_OXYGEN "Install Oxygen icon theme")
 endif()
 
 if (WITH_OXYGEN)
@@ -101,6 +101,9 @@ if (APPLE)
         option(WITH_NOTIFICATION_CENTER "OS X Notification Center support" ON)
         add_feature_info(WITH_NOTIFICATION_CENTER WITH_NOTIFICATION_CENTER "Use the OS X Notification Center")
     endif()
+    find_library(CARBON_LIBRARY Carbon)
+    mark_as_advanced(CARBON_LIBRARY)
+    link_libraries(${CARBON_LIBRARY})
 endif()
 
 # Always embed on Windows, OSX or for a static build; never embed when enabling KDE integration
@@ -130,6 +133,11 @@ if (LINK_EXTRA)
 endif()
 
 
+# List of authenticators and the cmake flags to build them
+# (currently that's just LDAP, but more can be added here).
+####################################################################
+option(WITH_LDAP "Enable LDAP authentication support if present on system" ON)
+
 # Setup CMake
 #####################################################################
 
@@ -511,6 +519,20 @@ if (CMAKE_COMPILER_IS_GNUCXX)
     string(REPLACE "-ansi" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
 endif()
 
+# Setup LDAP Authentication support.
+#####################################################################
+if (WITH_LDAP)
+    find_package(Ldap)
+    if (LDAP_FOUND)
+        message(STATUS "Enabling LDAP authentication support")
+        set(HAVE_LDAP true)
+        add_definitions(-DHAVE_LDAP)
+    else()
+        message(STATUS "Disabling LDAP authentication support")
+    endif()
+else()
+    message(STATUS "Not enabling LDAP authentication support")
+endif()
 
 # Setup KDE / KDE Frameworks
 #####################################################################