From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Wed, 18 Feb 2015 20:03:51 +0000 (+0100)
Subject: Merge pull request #107 from siduction-upstream/master
X-Git-Tag: 0.12-beta1~5
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=eaa1bd30bc088e5cae6d8a742d7aedb3d8ff1897;hp=-c

Merge pull request #107 from siduction-upstream/master

Set GIT_HEAD and GIT_DESCRIBE from environment
---

eaa1bd30bc088e5cae6d8a742d7aedb3d8ff1897
diff --combined CMakeLists.txt
index 4ec9377d,d9a397f8..c65f6be0
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -6,6 -6,7 +6,6 @@@
  # General setup
  #####################################################################
  
 -cmake_minimum_required(VERSION 2.8.9)  # You'll need at least 2.8.12 for KDE Frameworks integration
  project(QuasselIRC)
  
  # Versions
@@@ -33,6 -34,11 +33,6 @@@ include(FeatureSummary
  include(QuasselCompileSettings)
  include(QuasselMacros)
  
 -# Setting COMPILE_DEFINITIONS_<CONFIG> is deprecated since CMake 3.0 in favor of generator expressions.
 -# These have existed since CMake 2.8.10; until we depend on that, we have to explicitly enable the old policy.
 -if (CMAKE_MAJOR_VERSION GREATER 2)
 -    cmake_policy(SET CMP0043 OLD)
 -endif()
  
  # Options and variables that can be set on the command line
  #####################################################################
@@@ -113,22 -119,6 +113,22 @@@ if (LINK_EXTRA
  endif()
  
  
 +# Setup CMake
 +#####################################################################
 +
 +if (USE_QT5 AND WITH_KDE)
 +    cmake_minimum_required(VERSION 2.8.12)
 +else()
 +    cmake_minimum_required(VERSION 2.8.9)
 +endif()
 +
 +# Setting COMPILE_DEFINITIONS_<CONFIG> is deprecated since CMake 3.0 in favor of generator expressions.
 +# These have existed since CMake 2.8.10; until we depend on that, we have to explicitly enable the old policy.
 +if (CMAKE_MAJOR_VERSION GREATER 2)
 +    cmake_policy(SET CMP0043 OLD)
 +endif()
 +
 +
  # Simplify later checks
  #####################################################################
  
@@@ -149,7 -139,11 +149,7 @@@ if (USE_QT5
      add_definitions(-DHAVE_QT5)
  else()
      message(STATUS "Building for Qt4...")
 -    if (BUILD_GUI)
 -        set(QT_MIN_VERSION "4.6.0")
 -    else()
 -        set(QT_MIN_VERSION "4.4.0")
 -    endif()
 +    set(QT_MIN_VERSION "4.8.0")
  
      # Select a Qt installation here, if you don't want to use system Qt
      if(QT_PATH)
@@@ -262,17 -256,16 +262,17 @@@ if (USE_QT5
          endif()
  
          if (WITH_KDE)
 -            find_package(KF5TextWidgets QUIET)
 -            set_package_properties(KF5TextWidgets PROPERTIES TYPE REQUIRED
 -                URL "http://inqlude.org/libraries/ktextwidgets.html"
 -                DESCRIPTION "framework providing an assortment of widgets for displaying and editing text"
 -                PURPOSE     "Allows to use extra features provided by KDE Frameworks in input widgets"
 +            find_package(KF5 COMPONENTS ConfigWidgets CoreAddons Notifications NotifyConfig TextWidgets XmlGui QUIET)
 +            set_package_properties(KF5 PROPERTIES TYPE REQUIRED
 +                URL "http://www.kde.org"
 +                DESCRIPTION "KDE Frameworks"
 +                PURPOSE     "Required for integration into the Plasma desktop"
              )
  
          endif()
  
      endif(BUILD_GUI)
 +
      if (BUILD_CORE)
          find_package(Qt5Script QUIET)
          set_package_properties(Qt5Script PROPERTIES TYPE REQUIRED
@@@ -283,12 -276,14 +283,12 @@@
              DESCRIPTION "the database support module for Qt5"
          )
  
 -        # While QCA2 seems to support Qt5, it is not actually co-installable or distinguishable from the Qt4 version...
 -        # In order to avoid linking against the Qt4 version (which is probably the one installed), disable this for now
 -        #find_package(QCA2 QUIET)
 -        #set_package_properties(QCA2 PROPERTIES TYPE RECOMMENDED
 -        #    URL "https://projects.kde.org/projects/kdesupport/qca"
 -        #    DESCRIPTION "Qt Cryptographic Architecture"
 -        #    PURPOSE "Required for encryption support"
 -        #)
 +        find_package(QCA2-QT5)
 +        set_package_properties(QCA2-QT5 PROPERTIES TYPE RECOMMENDED
 +            URL "https://projects.kde.org/projects/kdesupport/qca"
 +            DESCRIPTION "Qt Cryptographic Architecture"
 +            PURPOSE "Required for encryption support"
 +        )
  
      endif(BUILD_CORE)
  
@@@ -297,7 -292,6 +297,7 @@@
                             DESCRIPTION "contains tools for handling translation files"
                             PURPOSE "Required for having translations"
      )
 +
      # Some Qt5 versions do not define a target for lconvert, so we need to find it ourselves
      if (Qt5LinguistTools_FOUND)
          if (NOT TARGET Qt5::lconvert AND TARGET Qt5::lrelease)
@@@ -430,11 -424,6 +430,11 @@@ if (MINGW AND NOT KDE4_FOUND
      add_definitions(-U__STRICT_ANSI__)
  endif()
  
 +# Sanitize compiler flags - old versions of KDE set -ansi, which breaks -std=c++11
 +if (CMAKE_COMPILER_IS_GNUCXX)
 +    string(REPLACE "-ansi" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
 +endif()
 +
  
  # Setup KDE / KDE Frameworks
  #####################################################################
@@@ -563,6 -552,17 +563,17 @@@ include(GetGitRevisionDescription
  get_git_head_revision(GIT_REFSPEC GIT_HEAD)
  git_describe(GIT_DESCRIBE --long)
  
+ # 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 ${GIT_HEAD}) 
+   endif ()
+   if (DEFINED ENV{GIT_DESCRIBE})
+      set(GIT_DESCRIBE ${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 "")