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

List:       kde-commits
Subject:    =?utf-8?q?=5Bgluon=5D_player=3A_Eliminate_the_KDE_entries_from_t?=
From:       Laszlo Papp <djszapi () archlinux ! us>
Date:       2011-05-17 15:21:30
Message-ID: 20110517152130.AA287A60A6 () git ! kde ! org
[Download RAW message or body]

Git commit 0abb0e534c663e8527ce597d91070904d065fa30 by Laszlo Papp.
Committed on 17/05/2011 at 17:03.
Pushed by lpapp into branch 'master'.

Eliminate the KDE entries from the touch player cmake file

* Use find_package(Qt4) since KDE is not needed for having the touch player
* Do not use kde4_add_app_icon, but follow the qt player icon installation way

M  +1    -0    player/CMakeLists.txt     
M  +5    -1    player/touch/CMakeLists.txt     

http://commits.kde.org/gluon/0abb0e534c663e8527ce597d91070904d065fa30

diff --git a/player/CMakeLists.txt b/player/CMakeLists.txt
index f501c52..a1b2182 100644
--- a/player/CMakeLists.txt
+++ b/player/CMakeLists.txt
@@ -37,6 +37,7 @@ if(LIBATTICA_FOUND)
         endif(KDE4_FOUND)
     endif(WITH_KDE)
 
+    find_package(Qt4)
     if(QT_QTDECLARATIVE_FOUND)
         add_subdirectory(touch)
     else(QT_QTDECLARATIVE_FOUND)
diff --git a/player/touch/CMakeLists.txt b/player/touch/CMakeLists.txt
index 1f8cca0..5f61883 100644
--- a/player/touch/CMakeLists.txt
+++ b/player/touch/CMakeLists.txt
@@ -64,7 +64,6 @@ if(APPLE)
     set_target_properties(gluon_qmlplayer PROPERTIES OUTPUT_NAME GluonPlayer)
 
 else()
-    kde4_add_app_icon(qmlplayer_SRCS \
                "${CMAKE_CURRENT_SOURCE_DIR}/../icons/*/apps/gluon-player.png")
     add_executable(gluon_qmlplayer ${qmlplayer_SRCS} ${GLUON_QMLPLAYER_RCC_SRCS})
 endif()
 target_link_libraries(gluon_qmlplayer ${GLUON_ENGINE_LIBS} ${GLUON_GRAPHICS_LIBS} \
${GLUON_PLAYER_LIBS} ${GLUON_INPUT_LIBS} ${QT_QTDECLARATIVE_LIBRARY}) @@ -79,5 +78,10 \
@@ set(GLUON_DECLARATIVE_LIBS  if(NOT APPLE)
     install(TARGETS gluon_qmlplayer DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
     install(FILES gluon_qmlplayer.desktop DESTINATION \
${SHARE_INSTALL_DIR}/applications) +
+    if(NOT PLAYER_ICONS_INSTALLED)
+        add_subdirectory(../icons icons)
+        set(PLAYER_ICONS_INSTALLED TRUE)
+    endif()
 endif()
 


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