'KDE/kdeartwork'

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

List:       kde-commits
Subject:    KDE/kdeartwork
From:       Alexander Neundorf <neundorf () kde ! org>
Date:       2008-12-03 21:22:54
Message-ID: 1228339374.185594.8422.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 892249 by neundorf:

-also use FindKDE4Workspace.cmake from kdeplasma-addons to search for the \
kscreensaver library (which unfortunately has the same name as the KDE3-one)

Alex




 AM            cmake/modules/FindKDE4Workspace.cmake  
 M  +5 -11     kscreensaver/CMakeLists.txt  
 M  +18 -18    kscreensaver/kdesavers/CMakeLists.txt  
 M  +1 -1      kscreensaver/kdesavers/asciiquarium/CMakeLists.txt  
 M  +2 -2      kscreensaver/kpartsaver/CMakeLists.txt  


** trunk/KDE/kdeartwork/cmake/modules/FindKDE4Workspace.cmake #property svn:eol-style
   + native
--- trunk/KDE/kdeartwork/kscreensaver/CMakeLists.txt #892248:892249
@@ -1,15 +1,9 @@
 
 option(WITH_xscreensaver   "Enable support for xscreensaver" ON)
 
-find_path( KSCREENSAVER_INCLUDE_DIR kscreensaver.h
-  PATHS ${KDE4_INCLUDE_DIR}
-)
+find_package(KDE4Workspace)
 
-find_library( KSCREENSAVER_LIBRARY kscreensaver
-  PATHS ${KDE4_LIB_DIR}
-)
-
-if(KSCREENSAVER_INCLUDE_DIR  AND  KSCREENSAVER_LIBRARY)
+if(KDE4WORKSPACE_FOUND)
 	macro_optional_find_package(OpenGL)
 	macro_log_feature(OPENGL_FOUND "OpenGL" "API for developing portable, interactive \
2D and 3D graphics applications" "http://mesa3d.sourceforge.net" FALSE "" "Provides \
3D screensavers.")  add_subdirectory( kdesavers ) 
@@ -22,6 +16,6 @@
 	        endif(XSCREENSAVER_FOUND)
 	endif(WITH_xscreensaver)
 
-else(KSCREENSAVER_INCLUDE_DIR  AND  KSCREENSAVER_LIBRARY)
-	message(STATUS "kscreensaver can't be compiled. Please install kdebase before to \
                compile it (need kscreensaver.h)")
-endif(KSCREENSAVER_INCLUDE_DIR  AND  KSCREENSAVER_LIBRARY)
+elseif(KDE4WORKSPACE_FOUND)
+	message(STATUS "kscreensaver can't be compiled. Please install kdebase/workspace \
before to compile it (need kscreensaver.h)") +endif(KDE4WORKSPACE_FOUND)
--- trunk/KDE/kdeartwork/kscreensaver/kdesavers/CMakeLists.txt #892248:892249
@@ -7,7 +7,7 @@
 
 option(KSCREENSAVER_SOUND_SUPPORT "Build with sound support" OFF)
 
-include_directories(${KSCREENSAVER_INCLUDE_DIR})
+include_directories(${KDE4WORKSPACE_INCLUDE_DIR})
 
 add_subdirectory( data )
 macro_optional_add_subdirectory( asciiquarium )
@@ -18,7 +18,7 @@
 
 kde4_add_executable(kbanner.kss ${kbanner.kss_SRCS})
 
-target_link_libraries(kbanner.kss  ${KDE4_KDEUI_LIBS} ${STRIGI_LIBRARIES}  \
${KSCREENSAVER_LIBRARY}) +target_link_libraries(kbanner.kss  ${KDE4_KDEUI_LIBS} \
${STRIGI_LIBRARIES}  ${KDE4WORKSPACE_KSCREENSAVER_LIBRARY})  
 install(TARGETS kbanner.kss  ${INSTALL_TARGETS_DEFAULT_ARGS} )
 
@@ -29,7 +29,7 @@
 
 kde4_add_executable(kpolygon.kss ${kpolygon.kss_SRCS})
 
-target_link_libraries(kpolygon.kss  ${KDE4_KDEUI_LIBS} ${STRIGI_LIBRARIES}  \
${KSCREENSAVER_LIBRARY}) +target_link_libraries(kpolygon.kss  ${KDE4_KDEUI_LIBS} \
${STRIGI_LIBRARIES}  ${KDE4WORKSPACE_KSCREENSAVER_LIBRARY})  
 install(TARGETS kpolygon.kss  ${INSTALL_TARGETS_DEFAULT_ARGS} )
 
@@ -42,7 +42,7 @@
 
 kde4_add_executable(kslideshow.kss ${kslideshow.kss_SRCS})
 
-target_link_libraries(kslideshow.kss  ${KDE4_KIO_LIBS}  m  ${KSCREENSAVER_LIBRARY})
+target_link_libraries(kslideshow.kss  ${KDE4_KIO_LIBS}  m  \
${KDE4WORKSPACE_KSCREENSAVER_LIBRARY})  
 install(TARGETS kslideshow.kss  ${INSTALL_TARGETS_DEFAULT_ARGS} )
 
@@ -53,7 +53,7 @@
 
 kde4_add_executable(klines.kss ${klines.kss_SRCS})
 
-target_link_libraries(klines.kss  ${KDE4_KDEUI_LIBS} ${STRIGI_LIBRARIES}  \
${KSCREENSAVER_LIBRARY}) +target_link_libraries(klines.kss  ${KDE4_KDEUI_LIBS} \
${STRIGI_LIBRARIES}  ${KDE4WORKSPACE_KSCREENSAVER_LIBRARY})  
 install(TARGETS klines.kss  ${INSTALL_TARGETS_DEFAULT_ARGS} )
 
@@ -64,7 +64,7 @@
 
 kde4_add_executable(klorenz.kss ${klorenz.kss_SRCS})
 
-target_link_libraries(klorenz.kss  ${KDE4_KDEUI_LIBS} ${STRIGI_LIBRARIES} m  \
${KSCREENSAVER_LIBRARY}) +target_link_libraries(klorenz.kss  ${KDE4_KDEUI_LIBS} \
${STRIGI_LIBRARIES} m  ${KDE4WORKSPACE_KSCREENSAVER_LIBRARY})  
 install(TARGETS klorenz.kss  ${INSTALL_TARGETS_DEFAULT_ARGS} )
 
@@ -75,7 +75,7 @@
 
 kde4_add_executable(kblob.kss ${kblob.kss_SRCS})
 
-target_link_libraries(kblob.kss  ${KDE4_KDEUI_LIBS} ${STRIGI_LIBRARIES} m  \
${KSCREENSAVER_LIBRARY}) +target_link_libraries(kblob.kss  ${KDE4_KDEUI_LIBS} \
${STRIGI_LIBRARIES} m  ${KDE4WORKSPACE_KSCREENSAVER_LIBRARY})  
 install(TARGETS kblob.kss  ${INSTALL_TARGETS_DEFAULT_ARGS} )
 
@@ -86,7 +86,7 @@
 
 kde4_add_executable(kvm.kss ${kvm.kss_SRCS})
 
-target_link_libraries(kvm.kss  ${KDE4_KDEUI_LIBS} ${STRIGI_LIBRARIES}  \
${KSCREENSAVER_LIBRARY}) +target_link_libraries(kvm.kss  ${KDE4_KDEUI_LIBS} \
${STRIGI_LIBRARIES}  ${KDE4WORKSPACE_KSCREENSAVER_LIBRARY})  
 install(TARGETS kvm.kss  ${INSTALL_TARGETS_DEFAULT_ARGS} )
 
@@ -97,7 +97,7 @@
 
 kde4_add_executable(kclock.kss ${kclock.kss_SRCS})
 
-target_link_libraries(kclock.kss  ${KDE4_KDEUI_LIBS} ${STRIGI_LIBRARIES} m  \
${KSCREENSAVER_LIBRARY}) +target_link_libraries(kclock.kss  ${KDE4_KDEUI_LIBS} \
${STRIGI_LIBRARIES} m  ${KDE4WORKSPACE_KSCREENSAVER_LIBRARY})  
 install(TARGETS kclock.kss ${INSTALL_TARGETS_DEFAULT_ARGS} )
 install(FILES KClock.desktop DESTINATION ${SERVICES_INSTALL_DIR}/ScreenSavers)
@@ -110,7 +110,7 @@
 
 kde4_add_executable(kscience.kss ${kscience.kss_SRCS})
 
-target_link_libraries(kscience.kss  ${KDE4_KDEUI_LIBS} ${STRIGI_LIBRARIES}  \
${KSCREENSAVER_LIBRARY}) +target_link_libraries(kscience.kss  ${KDE4_KDEUI_LIBS} \
${STRIGI_LIBRARIES}  ${KDE4WORKSPACE_KSCREENSAVER_LIBRARY})  
 install(TARGETS kscience.kss ${INSTALL_TARGETS_DEFAULT_ARGS} )
 install(FILES KScience.desktop DESTINATION ${SERVICES_INSTALL_DIR}/ScreenSavers)
@@ -138,47 +138,47 @@
     set(krotation.kss_SRCS rotation.cpp sspreviewarea.cpp)
     kde4_add_ui_files(krotation.kss_SRCS rotationcfg.ui)
     kde4_add_executable(krotation.kss ${krotation.kss_SRCS})
-    target_link_libraries(krotation.kss ${KDE4_KDEUI_LIBS} ${STRIGI_LIBRARIES} \
${QT_QTOPENGL_LIBRARY} ${OPENGL_glu_LIBRARY} ${KSCREENSAVER_LIBRARY}) +    \
target_link_libraries(krotation.kss ${KDE4_KDEUI_LIBS} ${STRIGI_LIBRARIES} \
${QT_QTOPENGL_LIBRARY} ${OPENGL_glu_LIBRARY} ${KDE4WORKSPACE_KSCREENSAVER_LIBRARY})  \
install(TARGETS krotation.kss ${INSTALL_TARGETS_DEFAULT_ARGS})  
     set(kpendulum.kss_SRCS pendulum.cpp sspreviewarea.cpp)
     kde4_add_ui_files(kpendulum.kss_SRCS pendulumcfg.ui)
     kde4_add_executable(kpendulum.kss ${kpendulum.kss_SRCS})
-    target_link_libraries(kpendulum.kss ${KDE4_KDEUI_LIBS} ${STRIGI_LIBRARIES} \
${QT_QTOPENGL_LIBRARY} ${OPENGL_glu_LIBRARY} ${KSCREENSAVER_LIBRARY}) +    \
target_link_libraries(kpendulum.kss ${KDE4_KDEUI_LIBS} ${STRIGI_LIBRARIES} \
${QT_QTOPENGL_LIBRARY} ${OPENGL_glu_LIBRARY} ${KDE4WORKSPACE_KSCREENSAVER_LIBRARY})  \
install(TARGETS kpendulum.kss ${INSTALL_TARGETS_DEFAULT_ARGS})  endif (EIGEN2_FOUND)
 
   set(ksolarwinds.kss_SRCS SolarWinds.cpp )
   kde4_add_executable(ksolarwinds.kss ${ksolarwinds.kss_SRCS})
-  target_link_libraries( ksolarwinds.kss ${KDE4_KDEUI_LIBS} ${STRIGI_LIBRARIES}  \
${QT_QTOPENGL_LIBRARY} ${OPENGL_glu_LIBRARY}  ${KSCREENSAVER_LIBRARY}) +  \
target_link_libraries( ksolarwinds.kss ${KDE4_KDEUI_LIBS} ${STRIGI_LIBRARIES}  \
${QT_QTOPENGL_LIBRARY} ${OPENGL_glu_LIBRARY}  ${KDE4WORKSPACE_KSCREENSAVER_LIBRARY})  \
install(TARGETS ksolarwinds.kss ${INSTALL_TARGETS_DEFAULT_ARGS} )  
   set(kflux.kss_SRCS Flux.cpp )
   kde4_add_executable(kflux.kss ${kflux.kss_SRCS})
-  target_link_libraries( kflux.kss ${KDE4_KDEUI_LIBS} ${STRIGI_LIBRARIES} \
${QT_QTOPENGL_LIBRARY} ${OPENGL_glu_LIBRARY} ${KSCREENSAVER_LIBRARY}) +  \
target_link_libraries( kflux.kss ${KDE4_KDEUI_LIBS} ${STRIGI_LIBRARIES} \
${QT_QTOPENGL_LIBRARY} ${OPENGL_glu_LIBRARY} ${KDE4WORKSPACE_KSCREENSAVER_LIBRARY})  \
install(TARGETS kflux.kss ${INSTALL_TARGETS_DEFAULT_ARGS} )  
   set(keuphoria.kss_SRCS Euphoria.cpp )
   kde4_add_executable(keuphoria.kss ${keuphoria.kss_SRCS})
-  target_link_libraries( keuphoria.kss ${KDE4_KDEUI_LIBS} ${STRIGI_LIBRARIES} \
${QT_QTOPENGL_LIBRARY} ${OPENGL_glu_LIBRARY} ${KSCREENSAVER_LIBRARY}) +  \
target_link_libraries( keuphoria.kss ${KDE4_KDEUI_LIBS} ${STRIGI_LIBRARIES} \
${QT_QTOPENGL_LIBRARY} ${OPENGL_glu_LIBRARY} ${KDE4WORKSPACE_KSCREENSAVER_LIBRARY})  \
install(TARGETS keuphoria.kss ${INSTALL_TARGETS_DEFAULT_ARGS} )  
   set(kfountain.kss_SRCS fountain.cpp )
   kde4_add_ui_files(kfountain.kss_SRCS fountaincfg.ui)
   kde4_add_executable(kfountain.kss ${kfountain.kss_SRCS})
-  target_link_libraries( kfountain.kss ${KDE4_KDEUI_LIBS} ${STRIGI_LIBRARIES} \
${QT_QTOPENGL_LIBRARY} ${OPENGL_glu_LIBRARY} ${KSCREENSAVER_LIBRARY}) +  \
target_link_libraries( kfountain.kss ${KDE4_KDEUI_LIBS} ${STRIGI_LIBRARIES} \
${QT_QTOPENGL_LIBRARY} ${OPENGL_glu_LIBRARY} ${KDE4WORKSPACE_KSCREENSAVER_LIBRARY})  \
install(TARGETS kfountain.kss ${INSTALL_TARGETS_DEFAULT_ARGS} )  
   set(kwave.kss_SRCS wave.cpp )
   kde4_add_ui_files(kwave.kss_SRCS wavecfg.ui)
   kde4_add_executable(kwave.kss ${kwave.kss_SRCS})
-  target_link_libraries( kwave.kss ${KDE4_KDEUI_LIBS} ${STRIGI_LIBRARIES} \
${QT_QTOPENGL_LIBRARY} ${OPENGL_glu_LIBRARY} ${KSCREENSAVER_LIBRARY}) +  \
target_link_libraries( kwave.kss ${KDE4_KDEUI_LIBS} ${STRIGI_LIBRARIES} \
${QT_QTOPENGL_LIBRARY} ${OPENGL_glu_LIBRARY} ${KDE4WORKSPACE_KSCREENSAVER_LIBRARY})  \
install(TARGETS kwave.kss ${INSTALL_TARGETS_DEFAULT_ARGS} )  
   set(kgravity.kss_SRCS gravity.cpp )
   kde4_add_ui_files(kgravity.kss_SRCS gravitycfg.ui)
   kde4_add_executable(kgravity.kss ${kgravity.kss_SRCS})
-  target_link_libraries( kgravity.kss ${KDE4_KDEUI_LIBS} ${STRIGI_LIBRARIES} \
${QT_QTOPENGL_LIBRARY} ${OPENGL_glu_LIBRARY} ${KSCREENSAVER_LIBRARY}) +  \
target_link_libraries( kgravity.kss ${KDE4_KDEUI_LIBS} ${STRIGI_LIBRARIES} \
${QT_QTOPENGL_LIBRARY} ${OPENGL_glu_LIBRARY} ${KDE4WORKSPACE_KSCREENSAVER_LIBRARY})  \
install(TARGETS kgravity.kss ${INSTALL_TARGETS_DEFAULT_ARGS} )  
   install( FILES KGravity.desktop KWave.desktop KFountain.desktop KFlux.desktop \
KEuphoria.desktop KSolarWinds.desktop KRotation.desktop KPendulum.desktop DESTINATION \
                ${SERVICES_INSTALL_DIR}/ScreenSavers )
--- trunk/KDE/kdeartwork/kscreensaver/kdesavers/asciiquarium/CMakeLists.txt \
#892248:892249 @@ -12,7 +12,7 @@
 kde4_add_kcfg_files(kdeasciiquarium_SRCS AASaverConfig.kcfgc)
 kde4_add_executable(kdeasciiquarium.kss ${kdeasciiquarium_SRCS})
 
-target_link_libraries(kdeasciiquarium.kss ${KDE4_KDEUI_LIBS}  \
${KSCREENSAVER_LIBRARY}) +target_link_libraries(kdeasciiquarium.kss \
${KDE4_KDEUI_LIBS}  ${KDE4WORKSPACE_KSCREENSAVER_LIBRARY})  install(TARGETS \
kdeasciiquarium.kss ${INSTALL_TARGETS_DEFAULT_ARGS})  
 install(FILES asciiquarium.desktop DESTINATION ${SERVICES_INSTALL_DIR}/ScreenSavers)
--- trunk/KDE/kdeartwork/kscreensaver/kpartsaver/CMakeLists.txt #892248:892249
@@ -1,7 +1,7 @@
 project(kpartsaver)
 
 
-include_directories(${KSCREENSAVER_INCLUDE_DIR})
+include_directories(${KDE4WORKSPACE_INCLUDE_DIR})
 
 set(kpartsaver.kss_SRCS kpartsaver.cpp )
 
@@ -9,7 +9,7 @@
 
 kde4_add_executable(kpartsaver.kss ${kpartsaver.kss_SRCS})
 
-target_link_libraries(kpartsaver.kss  ${KDE4_KPARTS_LIBS} ${KSCREENSAVER_LIBRARY})
+target_link_libraries(kpartsaver.kss  ${KDE4_KPARTS_LIBS} \
${KDE4WORKSPACE_KSCREENSAVER_LIBRARY})  
 install(TARGETS kpartsaver.kss  ${INSTALL_TARGETS_DEFAULT_ARGS} )
 


[prev in list] [next in list] [prev in thread] [next in thread]
Configure | About | News | Add a list | Sponsored by KoreLogic