kcontrol: refernce camel-case Fontconfig module variables too

fixes build failure due to kde4_optional_find_package() not setting
upper-case variables like macro_optional_find_package() did.

for reference:
a3a1e69f8a

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

kcontrol/kfontinst/CMakeLists.txt

@@ -7,6 +7,7 @@ if (X11_Xft_FOUND)
         ${KDE4_INCLUDES}
         ${FREETYPE_INCLUDE_DIRS}
         ${FONTCONFIG_INCLUDE_DIR}
+        ${Fontconfig_INCLUDE_DIRS}
         ${CMAKE_CURRENT_SOURCE_DIR}
         ${CMAKE_CURRENT_BINARY_DIR}
         ${CMAKE_CURRENT_SOURCE_DIR}/lib

kcontrol/kfontinst/dbus/CMakeLists.txt

@@ -7,8 +7,21 @@ include_directories(
 )
 add_definitions(${QT_DEFINITIONS})
 
-set(fontinst_bin_SRCS FcConfig.cpp FontInst.cpp Folder.cpp Main.cpp Utils.cpp ${libkfontinstdbusiface_SRCS} )
+set(fontinst_bin_SRCS
-set(fontinst_helper_SRCS FcConfig.cpp Helper.cpp Folder.cpp Utils.cpp ${libkfontinstdbusiface_SRCS} )
+    ${libkfontinstdbusiface_SRCS}
+    FcConfig.cpp
+    FontInst.cpp
+    Folder.cpp
+    Main.cpp
+    Utils.cpp
+)
+set(fontinst_helper_SRCS
+    ${libkfontinstdbusiface_SRCS}
+    FcConfig.cpp
+    Helper.cpp
+    Folder.cpp
+    Utils.cpp
+)
 
 # qt4_generate_dbus_interface(FontInst.h org.kde.fontinst.xml)
 qt4_add_dbus_adaptor(fontinst_bin_SRCS org.kde.fontinst.xml FontInst.h KFI::FontInst)
@@ -18,16 +31,37 @@ add_executable(fontinst_bin ${fontinst_bin_SRCS})
 add_executable(fontinst_helper ${fontinst_helper_SRCS})
 
 set_target_properties(fontinst_bin PROPERTIES OUTPUT_NAME fontinst)
-target_link_libraries(fontinst_bin ${KDE4_KDECORE_LIBS}
+target_link_libraries(fontinst_bin
-                      ${QT_QTDBUS_LIBRARY} ${QT_QTXML_LIBRARY} ${FONTCONFIG_LIBRARIES} kfontinst)
+    ${KDE4_KDECORE_LIBS}
+    ${QT_QTDBUS_LIBRARY}
+    ${QT_QTXML_LIBRARY}
+    ${FONTCONFIG_LIBRARIES}
+    ${Fontconfig_LIBRARIES}
+    kfontinst
+)
 
 set_target_properties(fontinst_helper PROPERTIES OUTPUT_NAME fontinst_helper)
-target_link_libraries(fontinst_helper ${KDE4_KDECORE_LIBS}
+target_link_libraries(fontinst_helper
-                      ${QT_QTDBUS_LIBRARY} ${QT_QTXML_LIBRARY} ${FONTCONFIG_LIBRARIES} kfontinst)
+    ${KDE4_KDECORE_LIBS}
+    ${QT_QTDBUS_LIBRARY}
+    ${QT_QTXML_LIBRARY}
+    ${FONTCONFIG_LIBRARIES}
+    ${Fontconfig_LIBRARIES}
+    kfontinst
+)
 
-install(TARGETS fontinst_bin DESTINATION ${KDE4_LIBEXEC_INSTALL_DIR} )
+install(
-install(TARGETS fontinst_helper DESTINATION ${KDE4_LIBEXEC_INSTALL_DIR} )
+    TARGETS fontinst_bin
-install(PROGRAMS fontinst_x11 DESTINATION ${KDE4_LIBEXEC_INSTALL_DIR})
+    DESTINATION ${KDE4_LIBEXEC_INSTALL_DIR}
+)
+install(
+    TARGETS fontinst_helper
+    DESTINATION ${KDE4_LIBEXEC_INSTALL_DIR}
+)
+install(
+    PROGRAMS fontinst_x11
+    DESTINATION ${KDE4_LIBEXEC_INSTALL_DIR}
+)
 
 kde4_add_dbus_service(org.kde.fontinst.service.in)
 

kcontrol/kfontinst/lib/CMakeLists.txt

@@ -1,13 +1,46 @@
-set(kfontinst_LIB_SRCS Misc.cpp Fc.cpp Family.cpp Style.cpp File.cpp)
+set(kfontinst_LIB_SRCS
-set(kfontinstui_LIB_SRCS FcEngine.cpp )
+    Misc.cpp
+    Fc.cpp
+    Family.cpp
+    Style.cpp
+    File.cpp
+)
+set(kfontinstui_LIB_SRCS
+    FcEngine.cpp
+)
 
 add_library(kfontinst SHARED ${kfontinst_LIB_SRCS})
-target_link_libraries(kfontinst ${KDE4_KDECORE_LIBS} ${QT_QTXML_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_QTCORE_LIBRARY} ${FREETYPE_LIBRARIES} ${FONTCONFIG_LIBRARIES})
+target_link_libraries(kfontinst
-set_target_properties(kfontinst PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
+    ${KDE4_KDECORE_LIBS}
+    ${QT_QTXML_LIBRARY}
+    ${QT_QTDBUS_LIBRARY}
+    ${QT_QTCORE_LIBRARY}
+    ${FREETYPE_LIBRARIES}
+    ${FONTCONFIG_LIBRARIES}
+    ${Fontconfig_LIBRARIES}
+)
+set_target_properties(kfontinst PROPERTIES
+    VERSION ${GENERIC_LIB_VERSION}
+    SOVERSION ${GENERIC_LIB_SOVERSION}
+)
 
 generate_export_header(kfontinst)
 
 add_library(kfontinstui SHARED ${kfontinstui_LIB_SRCS})
-target_link_libraries(kfontinstui ${KDE4_KIO_LIBS} ${FREETYPE_LIBRARIES} ${FONTCONFIG_LIBRARIES} ${X11_X11_LIB} ${X11_Xft_LIB} kfontinst)
+target_link_libraries(kfontinstui
-set_target_properties(kfontinstui PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
+    ${KDE4_KIO_LIBS}
-install(TARGETS kfontinst kfontinstui ${INSTALL_TARGETS_DEFAULT_ARGS})
+    ${FREETYPE_LIBRARIES}
+    ${FONTCONFIG_LIBRARIES}
+    ${Fontconfig_LIBRARIES}
+    ${X11_X11_LIB}
+    ${X11_Xft_LIB}
+    kfontinst
+)
+set_target_properties(kfontinstui PROPERTIES
+    VERSION ${GENERIC_LIB_VERSION}
+    SOVERSION ${GENERIC_LIB_SOVERSION}
+)
+
+install(
+    TARGETS kfontinst kfontinstui ${INSTALL_TARGETS_DEFAULT_ARGS}
+)

kcontrol/kfontinst/viewpart/CMakeLists.txt

@@ -2,15 +2,33 @@ include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}/../lib
     ${CMAKE_CURRENT_SOURCE_DIR}/
     ${CMAKE_CURRENT_BINARY_DIR}
-     )
+)
 
-set(kfontviewpart_PART_SRCS ${libkfontinstview_SRCS} ${libkfontinstdbusiface_SRCS} FontViewPart.cpp )
+set(kfontviewpart_PART_SRCS
+    ${libkfontinstview_SRCS}
+    ${libkfontinstdbusiface_SRCS}
+    FontViewPart.cpp
+)
 
 kde4_add_plugin(kfontviewpart ${kfontviewpart_PART_SRCS})
 
-target_link_libraries(kfontviewpart  ${KDE4_KPARTS_LIBS} ${FONTCONFIG_LIBRARIES} kfontinstui kfontinst )
+target_link_libraries(kfontviewpart
-
+    ${KDE4_KPARTS_LIBS}
-install(TARGETS kfontviewpart  DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} )
+    ${FONTCONFIG_LIBRARIES}
-install( FILES kfontviewpart.rc DESTINATION  ${KDE4_DATA_INSTALL_DIR}/kfontinst )
+    ${Fontconfig_LIBRARIES}
-install( FILES kfontviewpart.desktop  DESTINATION  ${KDE4_SERVICES_INSTALL_DIR} )
+    kfontinstui
+    kfontinst
+)
 
+install(
+    TARGETS kfontviewpart
+    DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}
+)
+install(
+    FILES kfontviewpart.rc
+    DESTINATION ${KDE4_DATA_INSTALL_DIR}/kfontinst
+)
+install(
+    FILES kfontviewpart.desktop
+    DESTINATION ${KDE4_SERVICES_INSTALL_DIR}
+)