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

List:       kde-commits
Subject:    KDE/kdeartwork
From:       Patrick Spendrin <ps_ml () gmx ! de>
Date:       2012-03-12 0:53:52
Message-ID: 20120312005352.B185FAC897 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1285078 by sengels:

on behalf of andriusr
enable kscreensaver basics on windows

 M  +2 -3      CMakeLists.txt  
 M  +14 -6     kscreensaver/kdesavers/CMakeLists.txt  


--- trunk/KDE/kdeartwork/CMakeLists.txt #1285077:1285078
@@ -17,18 +17,17 @@
 macro_optional_add_subdirectory(ColorSchemes)
 macro_optional_add_subdirectory(IconThemes)
 macro_optional_add_subdirectory(emoticons)
-if (Q_WS_X11)
    macro_optional_add_subdirectory(kscreensaver)
+if (Q_WS_X11)
    macro_optional_add_subdirectory(kwin-styles)
+   macro_optional_add_subdirectory(aurorae)
 endif (Q_WS_X11)
-
 macro_optional_add_subdirectory(sounds)
 macro_optional_add_subdirectory(styles)
 macro_optional_add_subdirectory(wallpapers)
 macro_optional_add_subdirectory(HighResolutionWallpapers)
 macro_optional_add_subdirectory(WeatherWallpapers)
 macro_optional_add_subdirectory(desktopthemes)
-macro_optional_add_subdirectory(aurorae)
 
 macro_display_feature_log()
 
--- trunk/KDE/kdeartwork/kscreensaver/kdesavers/CMakeLists.txt #1285077:1285078
@@ -1,3 +1,4 @@
+include(CheckIncludeFiles)
 check_include_files(limits      HAVE_NUMERIC_LIMITS)
 configure_file (config-kdesavers.h.cmake \
${CMAKE_CURRENT_BINARY_DIR}/config-kdesavers.h )  
@@ -14,6 +15,12 @@
 add_subdirectory( data )
 macro_optional_add_subdirectory( asciiquarium )
 
+if (WIN32)
+    SET(LIBMATH "")
+else (WIN32)
+    SET(LIBMATH "m")
+endif (WIN32)
+
 ########### next target ###############
 
 set(kbanner.kss_SRCS banner.cpp )
@@ -49,9 +56,9 @@
 if(HAVE_KEXIV2)
     include_directories( ${KEXIV2_INCLUDES} )
     set_source_files_properties(slideshow.cpp PROPERTIES COMPILE_FLAGS \
                -DHAVE_KEXIV2)
-    target_link_libraries(kslideshow.kss  ${KDE4_KIO_LIBS}  m  \
${KDE4WORKSPACE_KSCREENSAVER_LIBRARY} ${KEXIV2_LIBRARIES}) +    \
target_link_libraries(kslideshow.kss  ${KDE4_KIO_LIBS}  ${LIBMATH}  \
${KDE4WORKSPACE_KSCREENSAVER_LIBRARY} ${KEXIV2_LIBRARIES})  else(HAVE_KEXIV2)
-    target_link_libraries(kslideshow.kss  ${KDE4_KIO_LIBS}  m  \
${KDE4WORKSPACE_KSCREENSAVER_LIBRARY}) +    target_link_libraries(kslideshow.kss  \
${KDE4_KIO_LIBS}  ${LIBMATH}  ${KDE4WORKSPACE_KSCREENSAVER_LIBRARY})  \
endif(HAVE_KEXIV2)  
 install(TARGETS kslideshow.kss  ${INSTALL_TARGETS_DEFAULT_ARGS} )
@@ -74,7 +81,7 @@
 
 kde4_add_executable(klorenz.kss ${klorenz.kss_SRCS})
 
-target_link_libraries(klorenz.kss ${KDE4_KDEUI_LIBS} m \
${KDE4WORKSPACE_KSCREENSAVER_LIBRARY}) +target_link_libraries(klorenz.kss \
${KDE4_KDEUI_LIBS} ${LIBMATH} ${KDE4WORKSPACE_KSCREENSAVER_LIBRARY})  
 install(TARGETS klorenz.kss  ${INSTALL_TARGETS_DEFAULT_ARGS} )
 
@@ -85,7 +92,7 @@
 
 kde4_add_executable(kblob.kss ${kblob.kss_SRCS})
 
-target_link_libraries(kblob.kss ${KDE4_KDEUI_LIBS} m \
${KDE4WORKSPACE_KSCREENSAVER_LIBRARY}) +target_link_libraries(kblob.kss \
${KDE4_KDEUI_LIBS} ${LIBMATH} ${KDE4WORKSPACE_KSCREENSAVER_LIBRARY})  
 install(TARGETS kblob.kss  ${INSTALL_TARGETS_DEFAULT_ARGS} )
 
@@ -107,7 +114,7 @@
 
 kde4_add_executable(kclock.kss ${kclock.kss_SRCS})
 
-target_link_libraries(kclock.kss ${KDE4_KDEUI_LIBS} m \
${KDE4WORKSPACE_KSCREENSAVER_LIBRARY}) +target_link_libraries(kclock.kss \
${KDE4_KDEUI_LIBS} ${LIBMATH} ${KDE4WORKSPACE_KSCREENSAVER_LIBRARY})  
 install(TARGETS kclock.kss ${INSTALL_TARGETS_DEFAULT_ARGS} )
 install(FILES KClock.desktop DESTINATION ${SERVICES_INSTALL_DIR}/ScreenSavers)
@@ -116,6 +123,7 @@
 ########### next target ###############
 
 #set($(X11_KSAVERS)_SRCS dummy.cpp )
+if(Q_WS_X11)
 set(kscience.kss_SRCS science.cpp )
 
 kde4_add_executable(kscience.kss ${kscience.kss_SRCS})
@@ -124,8 +132,8 @@
 
 install(TARGETS kscience.kss ${INSTALL_TARGETS_DEFAULT_ARGS} )
 install(FILES KScience.desktop DESTINATION ${SERVICES_INSTALL_DIR}/ScreenSavers)
+endif(Q_WS_X11)
 
-
 ########### next target ###############
 
 message(STATUS "readd opengl+sound support screensaver")


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