X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=CMakeLists.txt;h=1762959e30fc5ebad0471d422f4a8087ec19ce36;hb=refs%2Fheads%2F0.12;hp=168162bf659692f1d67da0f20af67d99165dd6aa;hpb=8bf4155c52557a43571b5d82dcd710e63165fb04;p=quassel.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 168162bf..1762959e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,11 +11,12 @@ project(QuasselIRC)
 # Versions
 set(QUASSEL_MAJOR  0)
 set(QUASSEL_MINOR 12)
-set(QUASSEL_PATCH  4)
-set(QUASSEL_VERSION_STRING "0.12.4")
+set(QUASSEL_PATCH  5)
+set(QUASSEL_VERSION_STRING "0.12.5")
 
-# 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)
@@ -76,7 +77,7 @@ if (NOT WITH_KDE)
 endif()
 
 # For this, the feature info is added after we know if QtWebkit is installed
-option(WITH_WEBKIT "WebKit support (for link previews) (legacy)" ON)
+option(WITH_WEBKIT "WebKit support (for link previews) (legacy)" OFF)
 
 # For this, the feature info is added after we know if QtWebEngine is installed
 option(WITH_WEBENGINE "WebEngine support (for link previews)" ON)
@@ -87,6 +88,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
@@ -139,6 +143,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
 #####################################################################
@@ -609,7 +618,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