[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [discover] /: Merge branch 'Plasma/5.6'
From:       Harald Sitter <sitter () kde ! org>
Date:       2016-04-26 11:37:25
Message-ID: E1av1Iz-0004fK-Az () scm ! kde ! org
[Download RAW message or body]

Git commit db08217a9e1a4996ffa97006ff07dd860e463f30 by Harald Sitter.
Committed on 26/04/2016 at 11:37.
Pushed by sitter into branch 'master'.

Merge branch 'Plasma/5.6'

# Conflicts:
#	CMakeLists.txt

M  +5    -1    CMakeLists.txt
M  +1    -0    discover/CMakeLists.txt
M  +4    -0    discover/main.cpp

http://commits.kde.org/discover/db08217a9e1a4996ffa97006ff07dd860e463f30

diff --cc CMakeLists.txt
index 1d5a5ff,594fdb9..5459539
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -14,10 -16,9 +14,10 @@@ include(KDECMakeSettings
  include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
  include(ECMInstallIcons)
  include(ECMMarkAsTest)
 +include(ECMAddTests)
  include(GenerateExportHeader)
  
- find_package(KF5 REQUIRED CoreAddons Config DBusAddons I18n Archive Declarative)
 -find_package(KF5 REQUIRED CoreAddons Config Crash DBusAddons I18n Declarative)
++find_package(KF5 REQUIRED CoreAddons Config Crash DBusAddons I18n Archive Declarative)
  find_package(KF5TextWidgets REQUIRED)
  
  find_package(packagekitqt5)
@@@ -33,6 -34,12 +33,10 @@@ find_package(KF5Attica
  find_package(KF5NewStuff)
  # find_package(BODEGA QUIET)
  
+ if (${KF5_VERSION} VERSION_GREATER "5.14.0")
+     add_definitions(-DWITH_KCRASH_INIT)
+ endif()
+ 
 -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
 -
  configure_file(DiscoverVersion.h.in DiscoverVersion.h)
  
  add_subdirectory(libdiscover)
[prev in list] [next in list] [prev in thread] [next in thread]