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

List:       kde-commits
Subject:    KDE/kdebase
From:       Laurent Montel <montel () kde ! org>
Date:       2006-04-12 14:44:21
Message-ID: 1144853061.805200.15059.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 529095 by mlaurent:

Now kcontrol/fonts compiles fine


 M  +1 -0      CMakeLists.txt  
 M  +6 -0      ConfigureChecks.cmake  
 A             cmake/modules/FindFontconfig.cmake  
 M  +1 -1      config.h.cmake  
 M  +2 -2      workspace/kcontrol/CMakeLists.txt  
 M  +2 -2      workspace/kcontrol/fonts/CMakeLists.txt  


--- trunk/KDE/kdebase/CMakeLists.txt #529094:529095
@@ -13,6 +13,7 @@
 
 macro_optional_find_package(USB)
 macro_optional_find_package(KDM)
+macro_optional_find_package(Fontconfig)
 
 if (APPLE)
    find_package(Carbon REQUIRED)
--- trunk/KDE/kdebase/ConfigureChecks.cmake #529094:529095
@@ -163,6 +163,12 @@
    set(WITH_KDM_XCONSOLE 0)
 endif(KDE4_KDM_XCONSOLE)
 
+if(FONTCONFIG_FOUND)
+   set(HAVE_FONTCONFIG 1)
+else(FONTCONFIG_FOUND)
+   set(HAVE_FONTCONFIG 0)
+endif(FONTCONFIG_FOUND)
+
 #now check for dlfcn.h using the cmake supplied CHECK_include_FILE() macro
 # If definitions like -D_GNU_SOURCE are needed for these checks they
 # should be added to _KDE4_PLATFORM_DEFINITIONS when it is originally
--- trunk/KDE/kdebase/config.h.cmake #529094:529095
@@ -85,7 +85,7 @@
 #cmakedefine HAVE_FLOAT_H 1
 
 /* Defines if your system has the libfontconfig library */
-#define HAVE_FONTCONFIG 1
+#cmakedefine HAVE_FONTCONFIG 1
 
 /* Defines if you have FontEnc */
 #define HAVE_FONT_ENC 1
--- trunk/KDE/kdebase/workspace/kcontrol/CMakeLists.txt #529094:529095
@@ -24,7 +24,7 @@
 add_subdirectory( pics ) 
 add_subdirectory( colors ) 
 add_subdirectory( energy ) 
-#add_subdirectory( fonts ) 
+add_subdirectory( fonts ) 
 add_subdirectory( icons ) 
 add_subdirectory( screensaver ) 
 add_subdirectory( crypto ) 
@@ -37,9 +37,9 @@
 add_subdirectory( accessibility ) 
 add_subdirectory( infocenter ) 
 add_subdirectory( access )
+#add_subdirectory( kfontinst )
 message(STATUS "${CMAKE_CURRENT_SOURCE_DIR}: skipped subdir $(KSMCARD_SUBDIR)")
 message(STATUS "${CMAKE_CURRENT_SOURCE_DIR}: skipped subdir $(FONTINST_SUBDIR)")
-message(STATUS "${CMAKE_CURRENT_SOURCE_DIR}: Readd fonts )" )
 
 
 
--- trunk/KDE/kdebase/workspace/kcontrol/fonts/CMakeLists.txt #529094:529095
@@ -7,7 +7,7 @@
 
 ########### next target ###############
 
-set(kcm_fonts_PART_SRCS fonts.cpp )
+set(kcm_fonts_PART_SRCS fonts.cpp kxftconfig.cpp ${libkrd_SRCS} )
 
 kde4_automoc(${kcm_fonts_PART_SRCS})
 
@@ -15,7 +15,7 @@
 
 kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} kcm_fonts )
 
-target_link_libraries(kcm_fonts  ${KDE4_KDECORE_LIBS} kxftconfig krdb kdeui )
+target_link_libraries(kcm_fonts  ${KDE4_KDEUI_LIBS} ${FONTCONFIG_LIBRARIES})
 
 install_targets(${LIB_INSTALL_DIR}/kde4 kcm_fonts )
 
[prev in list] [next in list] [prev in thread] [next in thread]