X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=CMakeLists.txt;h=4d15ebc2390b1bc3ba8ff0d212d6b3f9f8436a79;hp=42f2ab36672b1540e0e1baa1a960be099a2000b9;hb=93605206bc40e06446efabc71e155a3216dbb0b9;hpb=61aac1868f15babb7086d8bc6bbcff530346f438

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 42f2ab36..4d15ebc2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,8 +14,9 @@ set(QUASSEL_MINOR 13)
 set(QUASSEL_PATCH  0)
 set(QUASSEL_VERSION_STRING "0.13-pre")
 
-# We want to know CMake's version for debug reasons
+# Output CMake version and build type for debug reasons
 message(STATUS "Using CMake ${CMAKE_VERSION}")
+message(STATUS "CMake build type: ${CMAKE_BUILD_TYPE}")
 
 # Tell CMake about or own modules
 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
@@ -133,9 +134,10 @@ if (LINK_EXTRA)
 endif()
 
 
-# LDAP Authentication (and other authentication backends).
+# 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)
+option(WITH_LDAP "Enable LDAP authentication support if present on system" ON)
 
 # Setup CMake
 #####################################################################
@@ -157,6 +159,11 @@ if (POLICY CMP0063)
     cmake_policy(SET CMP0063 NEW)
 endif()
 
+# Don't automoc generated files
+if (POLICY CMP0071)
+    cmake_policy(SET CMP0071 OLD)
+endif()
+
 
 # Simplify later checks
 #####################################################################
@@ -185,7 +192,7 @@ if (USE_QT5)
 
     find_package(Qt5Core ${QT_MIN_VERSION} QUIET)
     set_package_properties(Qt5Core PROPERTIES TYPE REQUIRED
-        URL "http://qt.digia.com"
+        URL "https://www.qt.io/"
         DESCRIPTION "contains core functionality for Qt"
     )
     # find_package without REQUIRED won't check for the version properly; also, older Qt5 versions
@@ -212,7 +219,7 @@ if (USE_QT5)
         if (NOT WIN32)
             find_package(Qt5DBus QUIET)
             set_package_properties(Qt5DBus PROPERTIES TYPE RECOMMENDED
-                URL "http://qt.digia.com"
+                URL "https://www.qt.io/"
                 DESCRIPTION "D-Bus support for Qt5"
                 PURPOSE     "Needed for supporting D-Bus-based notifications and tray icon, used by most modern desktop environments"
             )
@@ -228,7 +235,7 @@ if (USE_QT5)
 
         find_package(Qt5Multimedia QUIET)
         set_package_properties(Qt5Multimedia PROPERTIES TYPE RECOMMENDED
-            URL "http://qt.digia.com"
+            URL "https://www.qt.io/"
             DESCRIPTION "Multimedia support for Qt5"
             PURPOSE     "Required for audio notifications"
         )
@@ -261,14 +268,14 @@ if (USE_QT5)
         if (WITH_WEBKIT)
             find_package(Qt5WebKit QUIET)
             set_package_properties(Qt5WebKit PROPERTIES TYPE RECOMMENDED
-                URL "http://qt.digia.com"
+                URL "https://www.qt.io/"
                 DESCRIPTION "a WebKit implementation for Qt"
                 PURPOSE     "Needed for displaying previews for URLs in chat"
             )
             if (Qt5WebKit_FOUND)
                 find_package(Qt5WebKitWidgets QUIET)
                 set_package_properties(Qt5WebKitWidgets PROPERTIES TYPE RECOMMENDED
-                    URL "http://qt.digia.com"
+                    URL "https://www.qt.io/"
                     DESCRIPTION "widgets for Qt's WebKit implementation"
                     PURPOSE     "Needed for displaying previews for URLs in chat"
                 )
@@ -283,14 +290,14 @@ if (USE_QT5)
         if (WITH_WEBENGINE)
             find_package(Qt5WebEngine QUIET)
             set_package_properties(Qt5WebEngine PROPERTIES TYPE RECOMMENDED
-                URL "http://qt.digia.com"
+                URL "https://www.qt.io/"
                 DESCRIPTION "a WebEngine implementation for Qt"
                 PURPOSE     "Needed for displaying previews for URLs in chat"
             )
             if (Qt5WebEngine_FOUND)
                 find_package(Qt5WebEngineWidgets QUIET)
                 set_package_properties(Qt5WebEngineWidgets PROPERTIES TYPE RECOMMENDED
-                    URL "http://qt.digia.com"
+                    URL "https://www.qt.io/"
                     DESCRIPTION "widgets for Qt's WebEngine implementation"
                     PURPOSE     "Needed for displaying previews for URLs in chat"
                 )
@@ -520,17 +527,18 @@ endif()
 
 # Setup LDAP Authentication support.
 #####################################################################
-if(WITH_LDAP)
-	find_package(Ldap)
-	if(LDAP_FOUND)
-		message(STATUS "Enabling LDAP authentication support")
-		set(HAVE_LDAP true)
-	else(LDAP_FOUND)
-		message(STATUS "Disabling LDAP authentication support")
-	endif(LDAP_FOUND)
-else(WITH_LDAP)
-	message(STATUS "Not enabling LDAP authentication support")
-endif(WITH_LDAP)
+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
 #####################################################################
@@ -648,7 +656,7 @@ git_describe(GIT_DESCRIBE --long)
 # If in a Git repo we can get the commit-date from a git command
 if (GIT_HEAD)
     execute_process(
-        COMMAND git show -s --format=%ct
+        COMMAND git -c log.showsignature=false show -s --format=%ct
         WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
         OUTPUT_VARIABLE GIT_COMMIT_DATE
         OUTPUT_STRIP_TRAILING_WHITESPACE