Katana_mirror/kde-workspace
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kde-workspace.git synced 2025-02-24 02:42:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kcontrol: refernce camel-case Fontconfig module variables too

Browse source 
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>
This commit is contained in:
Ivailo Monev 2022-10-02 14:07:37 +03:00
parent a1c42383b9
commit 4ebf0c5a3d
4 changed files with 109 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
kcontrol/kfontinst/CMakeLists.txt
View file

@ -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

52
kcontrol/kfontinst/dbus/CMakeLists.txt
View file

@ -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_helper_SRCS FcConfig.cpp Helper.cpp Folder.cpp Utils.cpp ${libkfontinstdbusiface_SRCS} )
set(fontinst_bin_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}
${QT_QTDBUS_LIBRARY} ${QT_QTXML_LIBRARY} ${FONTCONFIG_LIBRARIES} kfontinst)
target_link_libraries(fontinst_bin
${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}
${QT_QTDBUS_LIBRARY} ${QT_QTXML_LIBRARY} ${FONTCONFIG_LIBRARIES} kfontinst)
target_link_libraries(fontinst_helper
${KDE4_KDECORE_LIBS}
${QT_QTDBUS_LIBRARY}
${QT_QTXML_LIBRARY}
${FONTCONFIG_LIBRARIES}
${Fontconfig_LIBRARIES}
kfontinst
)
install(TARGETS fontinst_bin DESTINATION ${KDE4_LIBEXEC_INSTALL_DIR} )
install(TARGETS fontinst_helper DESTINATION ${KDE4_LIBEXEC_INSTALL_DIR} )
install(PROGRAMS fontinst_x11 DESTINATION ${KDE4_LIBEXEC_INSTALL_DIR})
install(
TARGETS fontinst_bin
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)

47
kcontrol/kfontinst/lib/CMakeLists.txt
View file

@ -1,13 +1,46 @@
set(kfontinst_LIB_SRCS Misc.cpp Fc.cpp Family.cpp Style.cpp File.cpp)
set(kfontinstui_LIB_SRCS FcEngine.cpp )
set(kfontinst_LIB_SRCS
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})
set_target_properties(kfontinst PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
target_link_libraries(kfontinst
${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)
set_target_properties(kfontinstui PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
install(TARGETS kfontinst kfontinstui ${INSTALL_TARGETS_DEFAULT_ARGS})
target_link_libraries(kfontinstui
${KDE4_KIO_LIBS}
${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}
)

32
kcontrol/kfontinst/viewpart/CMakeLists.txt
View file

@ -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 )
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} )
target_link_libraries(kfontviewpart
${KDE4_KPARTS_LIBS}
${FONTCONFIG_LIBRARIES}
${Fontconfig_LIBRARIES}
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}
)