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

List:       kde-commits
Subject:    KDE/kdebase/workspace/kcontrol
From:       Patrick Spendrin <ps_ml () gmx ! de>
Date:       2011-01-13 18:47:15
Message-ID: 20110113184715.B16BBAC8B3 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1214233 by sengels:

add fonts kcm - it actually works rather ok under windows, even though no AA can be \
used for now (to much work) (forward port r1214214)

 M  +5 -1      CMakeLists.txt  
 M  +16 -5     fonts/CMakeLists.txt  
 M  +4 -0      fonts/fonts.cpp  


--- trunk/KDE/kdebase/workspace/kcontrol/CMakeLists.txt #1214232:1214233
@@ -46,7 +46,11 @@
 add_subdirectory( hardware )
 add_subdirectory( desktoppaths )
 
+if( FREETYPE_FOUND )
+    if( WIN32 OR FONTCONFIG_FOUND )
+        add_subdirectory( fonts )
+    endif( WIN32 OR FONTCONFIG_FOUND )
+endif( FREETYPE_FOUND )
 if(FONTCONFIG_FOUND AND FREETYPE_FOUND AND NOT WIN32)
-    add_subdirectory( fonts )
     add_subdirectory( kfontinst )
 endif(FONTCONFIG_FOUND AND FREETYPE_FOUND AND NOT WIN32)
--- trunk/KDE/kdebase/workspace/kcontrol/fonts/CMakeLists.txt #1214232:1214233
@@ -1,21 +1,32 @@
 
 KDE4_NO_ENABLE_FINAL(fonts)
+
+if(FONTCONFIG_FOUND)
 include_directories(${FONTCONFIG_INCLUDE_DIR})
+endif(FONTCONFIG_FOUND)
 include_directories(${FREETYPE_INCLUDE_DIR})
 
 ########### next target ###############
 
-set(kcm_fonts_PART_SRCS ../krdb/krdb.cpp fonts.cpp ${libkxftconfig_SRCS} )
+set(kcm_fonts_PART_SRCS ../krdb/krdb.cpp fonts.cpp)
 
+if(Q_WS_X11)
+    set(kcm_fonts_PART_SRCS ${kcm_fonts_PART_SRCS} ${libkxftconfig_SRCS})
+endif(Q_WS_X11)
 
 kde4_add_plugin(kcm_fonts ${kcm_fonts_PART_SRCS})
 
 
-target_link_libraries(kcm_fonts  ${KDE4_KDEUI_LIBS}
-   ${FONTCONFIG_LIBRARIES}
-   ${FREETYPE_LIBRARIES} ${QT_QTXML_LIBRARY} ${X11_LIBRARIES}
-)
+target_link_libraries(kcm_fonts ${KDE4_KDEUI_LIBS} ${FREETYPE_LIBRARIES} \
${QT_QTXML_LIBRARY})  
+if(Q_WS_X11)
+    if(FONTCONFIG_FOUND)
+        target_link_libraries(kcm_fonts ${FONTCONFIG_LIBRARIES})
+    endif(FONTCONFIG_FOUND)
+
+    target_link_libraries(kcm_fonts ${X11_LIBRARIES})
+endif(Q_WS_X11)
+
 install(TARGETS kcm_fonts  DESTINATION ${PLUGIN_INSTALL_DIR} )
 
 
--- trunk/KDE/kdebase/workspace/kcontrol/fonts/fonts.cpp #1214232:1214233
@@ -50,14 +50,18 @@
 #endif
 #endif
 
+#ifdef Q_WS_X11
 #include <X11/Xlib.h>
+#endif
 
 #include <KPluginFactory>
 
+#ifdef Q_WS_X11
 // X11 headers
 #undef Bool
 #undef Unsorted
 #undef None
+#endif
 
 static const char * const aa_rgb_xpm[]={
 "12 12 3 1",


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