Improve debugging for new IRCv3 functionality

[quassel.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b086070..9037c89 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,14 +11,8 @@ cmake_minimum_required(VERSION 3.5)
 # Tell CMake about or own modules
 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
 
-# Versions
-set(QUASSEL_MAJOR  0)
-set(QUASSEL_MINOR 13)
-set(QUASSEL_PATCH 50)
-set(QUASSEL_VERSION_STRING "0.14-pre")
-
-# Output CMake and Quassel versions as well as build type for debug reasons
-message(STATUS "Building Quassel ${QUASSEL_VERSION_STRING}...")
+include(QuasselVersion)
+
 message(STATUS "Using CMake ${CMAKE_VERSION}")
 
 # Set up build type rather early
@@ -113,6 +107,7 @@ if (NOT EMBED_DEFAULT)
 endif()
 
 # The following options are not for end-user consumption, so don't list them in the feature summary
+option(FATAL_WARNINGS "Make compile warnings fatal (most useful for CI builds)" OFF)
 cmake_dependent_option(DEPLOY "Add required libs to bundle resources and create a dmg" OFF "APPLE" OFF)
 
 # List of authenticators and the cmake flags to build them
@@ -340,6 +335,14 @@ set_package_properties(Boost PROPERTIES TYPE REQUIRED
     URL "https://www.boost.org/"
     DESCRIPTION "Boost libraries for C++"
 )
+# Older versions don't define the imported target
+if (NOT TARGET Boost::boost)
+    add_library(Boost::boost INTERFACE IMPORTED GLOBAL)
+    if (Boost_INCLUDE_DIRS)
+        set_target_properties(Boost::boost PROPERTIES
+            INTERFACE_INCLUDE_DIRECTORIES "${Boost_INCLUDE_DIRS}")
+    endif()
+endif()
 
 find_package(ZLIB REQUIRED)
 set_package_properties(ZLIB PROPERTIES TYPE REQUIRED
@@ -470,43 +473,6 @@ if (WIN32)
     endif()
 endif()
 
-# Generate version information from Git
-#####################################################################
-
-include(GetGitRevisionDescription)
-get_git_head_revision(GIT_REFSPEC GIT_HEAD)
-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 -c log.showsignature=false show -s --format=%ct
-        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-        OUTPUT_VARIABLE GIT_COMMIT_DATE
-        OUTPUT_STRIP_TRAILING_WHITESPACE
-    )
-endif()
-
-# If not in a Git repo try to read GIT_HEAD and GIT_DESCRIBE from
-# enviroment
-if (NOT GIT_HEAD OR NOT GIT_DESCRIBE)
-  if (DEFINED ENV{GIT_HEAD})
-      set(GIT_HEAD $ENV{GIT_HEAD})
-  endif()
-  if (DEFINED ENV{GIT_DESCRIBE})
-     set(GIT_DESCRIBE $ENV{GIT_DESCRIBE})
-  endif()
-endif()
-
-# Sanitize things if we're not in a Git repo
-if (NOT GIT_HEAD OR NOT GIT_DESCRIBE)
-    set(GIT_HEAD "")
-    set(GIT_DESCRIBE "")
-    set(GIT_COMMIT_DATE 0)
-endif()
-
-configure_file(version.h.in ${CMAKE_BINARY_DIR}/version.h @ONLY)
-
 # Prepare the build
 #####################################################################