Public Pastes
Guest

Test

By: a guest on Jan 28th, 2012  |  syntax: None  |  size: 2.31 KB  |  hits: 15  |  expires: Never
download  |  raw  |  embed  |  report abuse
Copied
  1. diff --git a/CMakeLists.txt b/CMakeLists.txt
  2. index 78e23aa..bf1775c 100644
  3. --- a/CMakeLists.txt
  4. +++ b/CMakeLists.txt
  5. @@ -113,10 +113,11 @@ endif(BUILD_GLUON_PLAYER)
  6.  
  7.  set(KDE_FAILED FALSE)
  8.  ######## KDE Parts ########
  9. -if(BUILD_PLASMOID OR BUILD_GLUON_CREATOR OR WITH_KDE)
  10. +if(BUILD_GLUON_PLAYER_ACTIVE OR BUILD_PLASMOID OR BUILD_GLUON_CREATOR OR WITH_KDE)
  11.      find_package(KDE4)
  12.      if(NOT KDE4_FOUND)
  13.          set(BUILD_PLASMOID OFF)
  14. +        set(BUILD_GLUON_PLAYER_ACTIVE OFF)
  15.          set(BUILD_GLUON_CREATOR OFF)
  16.          set(KDE_FAILED TRUE)
  17.          set(WITH_KDE FALSE)
  18. @@ -165,6 +166,7 @@ if(BUILD_GLUON_ENGINE)
  19.      message(STATUS "    Build other Components (BUILD_OTHER_COMPONENTS): ${BUILD_OTHER_COMPONENTS}")
  20.      message(STATUS "    Build other Assets (BUILD_OTHER_ASSETS): ${BUILD_OTHER_ASSETS}")
  21.  endif()
  22. +message(STATUS "Build Gluon Player for Plasma Active (BUILD_GLUON_PLAYER_ACTIVE): ${BUILD_GLUON_PLAYER_ACTIVE}")
  23.  message(STATUS "Build Gluon Player Library and Qt Application (BUILD_GLUON_PLAYER): ${BUILD_GLUON_PLAYER}")
  24.  message(STATUS "Build Gluon Player Plasmoid (BUILD_PLASMOID): ${BUILD_PLASMOID}")
  25.  message(STATUS "Build Gluon Creator Application (BUILD_GLUON_CREATOR): ${BUILD_GLUON_CREATOR}")
  26. diff --git a/player/CMakeLists.txt b/player/CMakeLists.txt
  27. index b4ceea9..53f9729 100644
  28. --- a/player/CMakeLists.txt
  29. +++ b/player/CMakeLists.txt
  30. @@ -60,12 +60,17 @@ if(LIBATTICA_FOUND)
  31.      endif()
  32.  
  33.      if(BUILD_GLUON_PLAYER_ACTIVE)
  34. +        set(ACTIVE_KDE_MIN_VERSION 4.8.0)
  35.          find_package(KDE4)
  36.          if(KDE4_FOUND)
  37. -            include_directories(${KDE4_INCLUDES})
  38. -            add_subdirectory(active)
  39. +            if(NOT ${KDE_VERSION} VERSION_LESS ACTIVE_KDE_MIN_VERSION)
  40. +                include_directories(${KDE4_INCLUDES})
  41. +                add_subdirectory(active)
  42. +            else(NOT ${KDE_VERSION} VERSION_LESS ACTIVE_KDE_MIN_VERSION)
  43. +                message(STATUS "KDE libraries are very old (need >= ${ACTIVE_KDE_MIN_VERSION}) to build the Plasma Active Player")
  44. +            endif(NOT ${KDE_VERSION} VERSION_LESS ACTIVE_KDE_MIN_VERSION)
  45.          else(KDE4_FOUND)
  46. -            message(STATUS "KDE libraries are not found - not building the Plasmoid Active Player")
  47. +            message(STATUS "KDE libraries are not found - not building the Plasma Active Player")
  48.          endif(KDE4_FOUND)
  49.      endif()
create a new version of this paste RAW Paste Data