From: Daniel Albers <daniel@lbe.rs>
Date: Thu, 31 Mar 2016 23:51:51 +0000 (+0200)
Subject: Merge pull request #165 from esainane/coreinfo-dirty-status
X-Git-Tag: travis-deploy-test~501
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=dd711790dddee81442e2138b3917764dac39c487;hp=-c

Merge pull request #165 from esainane/coreinfo-dirty-status

Include dirty status in core information
---

dd711790dddee81442e2138b3917764dac39c487
diff --combined CMakeLists.txt
index aa0b4923,ec8d61e3..f5ca7803
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -131,11 -131,6 +131,11 @@@ if (CMAKE_MAJOR_VERSION GREATER 2
      cmake_policy(SET CMP0043 OLD)
  endif()
  
 +# Honor visibility settings for all target types
 +if (CMAKE_VERSION VERSION_GREATER 3.3)
 +    cmake_policy(SET CMP0063 NEW)
 +endif()
 +
  
  # Simplify later checks
  #####################################################################
@@@ -222,21 -217,12 +222,21 @@@ if (USE_QT5
              PURPOSE     "Required for audio notifications"
          )
  
 -        find_package(LibsnoreQt5 0.5.70 QUIET)
 +        find_package(LibsnoreQt5 0.7.0 QUIET)
          set_package_properties(LibsnoreQt5 PROPERTIES TYPE OPTIONAL
              URL "https://projects.kde.org/projects/playground/libs/snorenotify"
              DESCRIPTION "a cross-platform notification framework"
              PURPOSE     "Enable support for the snorenotify framework"
          )
 +        if(LibsnoreQt5_FOUND)
 +            find_package(LibsnoreSettingsQt5)
 +            set_package_properties(LibsnoreSettingsQt5 PROPERTIES TYPE REQUIRED
 +                URL "https://projects.kde.org/projects/playground/libs/snorenotify"
 +                DESCRIPTION "a cross-platform notification framework"
 +                PURPOSE     "Enable support for the snorenotify framework"
 +            )
 +        endif()
 +
  
          if (WITH_WEBKIT)
              find_package(Qt5WebKit QUIET)
@@@ -280,22 -266,17 +280,22 @@@
  
          if (ECM_FOUND)
              list(APPEND CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
 -        endif()
 -
 -        if (WITH_KDE)
 -            find_package(KF5 COMPONENTS ConfigWidgets CoreAddons Notifications NotifyConfig TextWidgets WidgetsAddons 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()
 +            if (WITH_KDE)
 +                find_package(KF5 COMPONENTS ConfigWidgets CoreAddons Notifications NotifyConfig TextWidgets WidgetsAddons 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"
 +                )
 +            else(WITH_KDE)
 +                find_package(KF5Sonnet QUIET)
 +                set_package_properties(KF5Sonnet PROPERTIES TYPE RECOMMENDED
 +                    URL "http://api.kde.org/frameworks-api/frameworks5-apidocs/sonnet/html"
 +                    DESCRIPTION "framework for providing spell-checking capabilities"
 +                    PURPOSE "Enables spell-checking support in input widgets"
 +                )
 +            endif(WITH_KDE)
 +        endif(ECM_FOUND)
  
      endif(BUILD_GUI)
  
@@@ -440,7 -421,7 +440,7 @@@ set(CMAKE_REQUIRED_INCLUDES ${QT_INCLUD
  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Core_EXECUTABLE_COMPILE_FLAGS}")
  check_cxx_source_compiles("
      #include \"qglobal.h\"
 -    #if defined QT_NO_OPENSSL || defined QT_NO_SSL
 +    #if defined QT_NO_SSL
      #  error \"No SSL support\"
      #endif
      int main() {}"
@@@ -580,7 -561,7 +580,7 @@@ endif(
  
  include(GetGitRevisionDescription)
  get_git_head_revision(GIT_REFSPEC GIT_HEAD)
- git_describe(GIT_DESCRIBE --long)
+ git_describe(GIT_DESCRIBE --long --dirty)
  
  # If not in a Git repo try to read GIT_HEAD and GIT_DESCRIBE from
  # enviroment