Ticket #47883: patch-no-KDE.diff

File patch-no-KDE.diff, 1.7 KB (added by RJVB (René Bertin), 9 years ago)
  • plugins/kjobtracker/CMakeLists.txt

    diff --git plugins/kjobtracker/CMakeLists.txt plugins/kjobtracker/CMakeLists.txt
    index a81f512..c14a9d6 100644
     
    1 if(Qt5Core_FOUND)
    2   find_package(KF5CoreAddons NO_MODULE QUIET)
    3   set_package_properties(KF5CoreAddons PROPERTIES
    4     TYPE OPTIONAL
    5     DESCRIPTION "KDE KCoreAddons Framework"
    6     URL "http://www.kde.org/"
    7     PURPOSE "Required for the KJob tracker plug-in."
    8   )
    9 else()
    10   # ugly workaround for FindKDE4Internal messing with the install rpath (https://github.com/KDAB/GammaRay/issues/36)
    11   set(_old_CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_RPATH})
    12   find_package(KDE4)
    13   set(CMAKE_INSTALL_RPATH ${_old_CMAKE_INSTALL_RPATH})
    14 
    15   set_package_properties(KDE4 PROPERTIES
    16     TYPE OPTIONAL
    17     DESCRIPTION "KDE libraries"
    18     URL "http://www.kde.org/"
    19     PURPOSE "Required for the KJob tracker plug-in."
    20   )
    21 endif()
     1#if(Qt5Core_FOUND)
     2#  find_package(KF5CoreAddons NO_MODULE QUIET)
     3#  set_package_properties(KF5CoreAddons PROPERTIES
     4#    TYPE OPTIONAL
     5#    DESCRIPTION "KDE KCoreAddons Framework"
     6#    URL "http://www.kde.org/"
     7#    PURPOSE "Required for the KJob tracker plug-in."
     8#  )
     9#else()
     10#  # ugly workaround for FindKDE4Internal messing with the install rpath (https://github.com/KDAB/GammaRay/issues/36)
     11#  set(_old_CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_RPATH})
     12#  find_package(KDE4)
     13#  set(CMAKE_INSTALL_RPATH ${_old_CMAKE_INSTALL_RPATH})
     14#
     15#  set_package_properties(KDE4 PROPERTIES
     16#    TYPE OPTIONAL
     17#    DESCRIPTION "KDE libraries"
     18#    URL "http://www.kde.org/"
     19#    PURPOSE "Required for the KJob tracker plug-in."
     20#  )
     21#endif()
    2222
    2323# probe part
    2424if(KDE4_FOUND OR KF5CoreAddons_FOUND)