Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-23 18:32:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

build system cleanup

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
This commit is contained in:
Ivailo Monev 2019-05-13 18:23:35 +00:00
parent 1c6abfedcf
commit f9a80a9d0f
7 changed files with 74 additions and 131 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
CMakeLists.txt
View file

@ -170,9 +170,6 @@ add_feature_info(resolv WITH_RESOLV "an open source something")
option(WITH_NSL "Build nsl support" ON)
add_feature_info(nsl WITH_NSL "an open source something")
option(WITH_X11 "Build X11/X.Org support" ON)
add_feature_info(x11 WITH_X11 "an open source something")
# optional features
option(KATIE_UTILS "Build maintainance utilities" OFF)
add_feature_info(utils KATIE_UTILS "developers build option")
@ -580,26 +577,24 @@ if(NOT WITH_ICONV OR NOT ICONV_FOUND)
endif()
# keep in sync with the gui component CMake file, only definitions setup is needed here
if(WITH_X11 AND X11_FOUND)
foreach(x11ext Xshape Xinerama Xrandr Xrender Xfixes Xcursor Xinput)
if(NOT X11_${x11ext}_FOUND)
message(WARNING "The X11 ${x11ext} extension was not found")
string(TOUPPER "${x11ext}" upperext)
katie_definition(-DQT_NO_${upperext})
endif()
endforeach()
if(NOT X11_Xext_FOUND)
message(WARNING "The X11 Xext extension was not found")
katie_definition(-DQT_NO_XSYNC -DQT_NO_XSHAPE -DQTT_NO_XSHM)
endif()
if(NOT X11_Xinput_FOUND)
message(WARNING "X11 Xinput extension was not found thus disabling tabled support too")
katie_definition(-DQT_NO_TABLET)
endif()
if(NOT X11_SM_FOUND)
message(WARNING "X11 SM was not found thus disabling session manager support")
katie_definition(-DQT_NO_SESSIONMANAGER)
foreach(x11ext Xshape Xinerama Xrandr Xrender Xfixes Xcursor Xinput)
if(NOT X11_${x11ext}_FOUND)
message(WARNING "The X11 ${x11ext} extension was not found")
string(TOUPPER "${x11ext}" upperext)
katie_definition(-DQT_NO_${upperext})
endif()
endforeach()
if(NOT X11_Xext_FOUND)
message(WARNING "The X11 Xext extension was not found")
katie_definition(-DQT_NO_XSYNC -DQT_NO_XSHAPE -DQTT_NO_XSHM)
endif()
if(NOT X11_Xinput_FOUND)
message(WARNING "X11 Xinput extension was not found thus disabling tabled support too")
katie_definition(-DQT_NO_TABLET)
endif()
if(NOT X11_SM_FOUND)
message(WARNING "X11 SM was not found thus disabling session manager support")
katie_definition(-DQT_NO_SESSIONMANAGER)
endif()
# semi-shared
@ -963,11 +958,9 @@ katie_generate_obsolete(qxmlstreamreader.h QtXml qxmlstream.h)
katie_generate_obsolete(qxmlstreamwriter.h QtXml qxmlstream.h)
katie_generate_obsolete(qxmlstreamattribute.h QtXml qxmlstream.h)
# aliases are not handled by the incfsck script on purpose
if(UNIX AND WITH_X11 AND X11_FOUND)
katie_generate_obsolete(qx11info.h QtGui qx11info_x11.h)
katie_generate_obsolete(qx11embedcontainer.h QtGui qx11embed_x11.h)
katie_generate_obsolete(qx11embedwidget.h QtGui qx11embed_x11.h)
endif()
katie_generate_obsolete(qx11info.h QtGui qx11info_x11.h)
katie_generate_obsolete(qx11embedcontainer.h QtGui qx11embed_x11.h)
katie_generate_obsolete(qx11embedwidget.h QtGui qx11embed_x11.h)
# those have shuffled from QtDesigner to QtUiTools
katie_generate_obsolete(customwidget.h QtDesigner ../QtUiTools/customwidget.h)
katie_generate_obsolete(qdesignercustomwidgetinterface.h QtDesigner ../QtUiTools/customwidget.h)

45
src/gui/CMakeLists.txt
View file

@ -1,5 +1,5 @@
add_definitions(-DQT_BUILD_GUI_LIB)
set(EXTRA_GUI_LIBS KtCore KtXml ${FREETYPE_LIBRARIES})
set(EXTRA_GUI_LIBS KtCore KtXml ${FREETYPE_LIBRARIES} ${X11_LIBRARIES} ${X11_X11_LIB} ${X11_Xt_LIB} ${X11_Xi_LIB})
set(GUI_PUBLIC_HEADERS
${GUI_PUBLIC_HEADERS}
@ -470,27 +470,18 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR}/widgets
${CMAKE_SOURCE_DIR}/src/core/tools
${FREETYPE_INCLUDE_DIRS}
${X11_INCLUDE_DIR}
)
# keep in sync with the top-level CMake file, only libraries setup is needed here
if(WITH_X11 AND X11_FOUND)
set(EXTRA_GUI_LIBS
${EXTRA_GUI_LIBS}
${X11_LIBRARIES}
${X11_X11_LIB}
${X11_Xt_LIB}
${X11_Xi_LIB}
)
include_directories(${X11_INCLUDE_DIR})
foreach(x11ext Xshape Xinerama Xrandr Xrender Xfixes Xcursor Xinput Xext)
if(X11_${x11ext}_FOUND AND X11_${x11ext}_LIB)
set(EXTRA_GUI_LIBS
${EXTRA_GUI_LIBS}
${X11_${x11ext}_LIB}
)
endif()
endforeach()
endif()
foreach(x11ext Xshape Xinerama Xrandr Xrender Xfixes Xcursor Xinput Xext)
if(X11_${x11ext}_FOUND AND X11_${x11ext}_LIB)
set(EXTRA_GUI_LIBS
${EXTRA_GUI_LIBS}
${X11_${x11ext}_LIB}
)
endif()
endforeach()
if(WITH_NIS AND NIS_FOUND)
set(EXTRA_GUI_LIBS
@ -500,6 +491,14 @@ if(WITH_NIS AND NIS_FOUND)
include_directories(${NIS_INCLUDES})
endif()
if(WITH_NSL AND NSL_FOUND)
set(EXTRA_GUI_LIBS
${EXTRA_GUI_LIBS}
${NSL_LIBRARIES}
)
include_directories(${NSL_INCLUDES})
endif()
set(GUI_HEADERS
${GUI_HEADERS}
${CMAKE_CURRENT_SOURCE_DIR}/qguicommon_p.h
@ -553,14 +552,6 @@ katie_generate_public("${GUI_PUBLIC_HEADERS}" QtGui)
katie_generate_package(KtGui "KtCore KtXml")
katie_setup_target(KtGui ${GUI_SOURCES} ${GUI_HEADERS})
if(WITH_NSL AND NSL_FOUND)
include_directories(${NSL_INCLUDES})
set(EXTRA_GUI_LIBS
${EXTRA_GUI_LIBS}
${NSL_LIBRARIES}
)
endif()
add_library(KtGui ${KATIE_TYPE} ${KtGui_SOURCES})
target_link_libraries(KtGui ${EXTRA_GUI_LIBS})
set_target_properties(KtGui PROPERTIES

13
src/gui/image/image.cmake
View file

@ -14,6 +14,7 @@ set(GUI_HEADERS
${CMAKE_CURRENT_SOURCE_DIR}/image/qmovie.h
${CMAKE_CURRENT_SOURCE_DIR}/image/qpixmap.h
${CMAKE_CURRENT_SOURCE_DIR}/image/qpixmap_raster_p.h
${CMAKE_CURRENT_SOURCE_DIR}/image/qpixmap_x11_p.h
${CMAKE_CURRENT_SOURCE_DIR}/image/qpixmapcache.h
${CMAKE_CURRENT_SOURCE_DIR}/image/qpixmapcache_p.h
${CMAKE_CURRENT_SOURCE_DIR}/image/qpixmapdata_p.h
@ -42,6 +43,7 @@ set(GUI_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/image/qiconengineplugin.cpp
${CMAKE_CURRENT_SOURCE_DIR}/image/qmovie.cpp
${CMAKE_CURRENT_SOURCE_DIR}/image/qpixmap_raster.cpp
${CMAKE_CURRENT_SOURCE_DIR}/image/qpixmap_x11.cpp
# Built-in image format support
${CMAKE_CURRENT_SOURCE_DIR}/image/qbmphandler.cpp
${CMAKE_CURRENT_SOURCE_DIR}/image/qppmhandler.cpp
@ -113,14 +115,3 @@ if(WITH_TIFF AND TIFF_FOUND)
)
include_directories(${TIFF_INCLUDE_DIR})
endif()
if(WITH_X11 AND X11_FOUND)
set(GUI_HEADERS
${GUI_HEADERS}
${CMAKE_CURRENT_SOURCE_DIR}/image/qpixmap_x11_p.h
)
set(GUI_SOURCES
${GUI_SOURCES}
${CMAKE_CURRENT_SOURCE_DIR}/image/qpixmap_x11.cpp
)
endif()

52
src/gui/kernel/kernel.cmake
View file

@ -41,6 +41,9 @@ set(GUI_HEADERS
${CMAKE_CURRENT_SOURCE_DIR}/kernel/qgesturemanager_p.h
${CMAKE_CURRENT_SOURCE_DIR}/kernel/qguiplatformplugin.h
${CMAKE_CURRENT_SOURCE_DIR}/kernel/qt_x11_p.h
${CMAKE_CURRENT_SOURCE_DIR}/kernel/qx11embed_x11.h
${CMAKE_CURRENT_SOURCE_DIR}/kernel/qx11info_x11.h
${CMAKE_CURRENT_SOURCE_DIR}/kernel/qeventdispatcher_x11_p.h
)
set(GUI_SOURCES
@ -76,42 +79,31 @@ set(GUI_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/kernel/qgesturemanager.cpp
${CMAKE_CURRENT_SOURCE_DIR}/kernel/qdesktopwidget.cpp
${CMAKE_CURRENT_SOURCE_DIR}/kernel/qguiplatformplugin.cpp
${CMAKE_CURRENT_SOURCE_DIR}/kernel/qapplication_x11.cpp
${CMAKE_CURRENT_SOURCE_DIR}/kernel/qclipboard_x11.cpp
${CMAKE_CURRENT_SOURCE_DIR}/kernel/qcursor_x11.cpp
${CMAKE_CURRENT_SOURCE_DIR}/kernel/qdnd_x11.cpp
${CMAKE_CURRENT_SOURCE_DIR}/kernel/qdesktopwidget_x11.cpp
${CMAKE_CURRENT_SOURCE_DIR}/kernel/qmotifdnd_x11.cpp
${CMAKE_CURRENT_SOURCE_DIR}/kernel/qwidget_x11.cpp
${CMAKE_CURRENT_SOURCE_DIR}/kernel/qx11embed_x11.cpp
${CMAKE_CURRENT_SOURCE_DIR}/kernel/qx11info_x11.cpp
${CMAKE_CURRENT_SOURCE_DIR}/kernel/qkeymapper_x11.cpp
${CMAKE_CURRENT_SOURCE_DIR}/kernel/qeventdispatcher_x11.cpp
)
if(WITH_X11 AND X11_FOUND)
if(WITH_GLIB2 AND GLIB2_FOUND)
set(GUI_HEADERS
${GUI_HEADERS}
${CMAKE_CURRENT_SOURCE_DIR}/kernel/qx11embed_x11.h
${CMAKE_CURRENT_SOURCE_DIR}/kernel/qx11info_x11.h
${CMAKE_CURRENT_SOURCE_DIR}/kernel/qeventdispatcher_x11_p.h
${CMAKE_CURRENT_SOURCE_DIR}/kernel/qguieventdispatcher_glib_p.h
)
set(GUI_SOURCES
${GUI_SOURCES}
${CMAKE_CURRENT_SOURCE_DIR}/kernel/qapplication_x11.cpp
${CMAKE_CURRENT_SOURCE_DIR}/kernel/qclipboard_x11.cpp
${CMAKE_CURRENT_SOURCE_DIR}/kernel/qcursor_x11.cpp
${CMAKE_CURRENT_SOURCE_DIR}/kernel/qdnd_x11.cpp
${CMAKE_CURRENT_SOURCE_DIR}/kernel/qdesktopwidget_x11.cpp
${CMAKE_CURRENT_SOURCE_DIR}/kernel/qmotifdnd_x11.cpp
${CMAKE_CURRENT_SOURCE_DIR}/kernel/qwidget_x11.cpp
${CMAKE_CURRENT_SOURCE_DIR}/kernel/qx11embed_x11.cpp
${CMAKE_CURRENT_SOURCE_DIR}/kernel/qx11info_x11.cpp
${CMAKE_CURRENT_SOURCE_DIR}/kernel/qkeymapper_x11.cpp
${CMAKE_CURRENT_SOURCE_DIR}/kernel/qeventdispatcher_x11.cpp
${CMAKE_CURRENT_SOURCE_DIR}/kernel/qguieventdispatcher_glib.cpp
)
if(WITH_GLIB2 AND GLIB2_FOUND)
set(GUI_HEADERS
${GUI_HEADERS}
${CMAKE_CURRENT_SOURCE_DIR}/kernel/qguieventdispatcher_glib_p.h
)
set(GUI_SOURCES
${GUI_SOURCES}
${CMAKE_CURRENT_SOURCE_DIR}/kernel/qguieventdispatcher_glib.cpp
)
set(EXTRA_GUI_LIBS
${EXTRA_GUI_LIBS}
${GLIB2_LIBRARIES}
)
include_directories(${GLIB2_INCLUDES})
endif()
set(EXTRA_GUI_LIBS
${EXTRA_GUI_LIBS}
${GLIB2_LIBRARIES}
)
include_directories(${GLIB2_INCLUDES})
endif()

23
src/gui/painting/painting.cmake
View file

@ -55,6 +55,8 @@ set(GUI_HEADERS
${CMAKE_CURRENT_SOURCE_DIR}/painting/qwindowsurface_raster_p.h
${CMAKE_CURRENT_SOURCE_DIR}/painting/qrgb.h
${CMAKE_CURRENT_SOURCE_DIR}/painting/qprinterinfo_unix_p.h
${CMAKE_CURRENT_SOURCE_DIR}/painting/qpaintengine_x11_p.h
${CMAKE_CURRENT_SOURCE_DIR}/painting/qwindowsurface_x11_p.h
)
set(GUI_SOURCES
@ -101,23 +103,12 @@ set(GUI_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/painting/qwindowsurface_raster.cpp
${CMAKE_CURRENT_SOURCE_DIR}/painting/qprinterinfo_unix.cpp
${CMAKE_CURRENT_SOURCE_DIR}/painting/qgrayraster.c
${CMAKE_CURRENT_SOURCE_DIR}/painting/qcolormap_x11.cpp
${CMAKE_CURRENT_SOURCE_DIR}/painting/qpaintdevice_x11.cpp
${CMAKE_CURRENT_SOURCE_DIR}/painting/qpaintengine_x11.cpp
${CMAKE_CURRENT_SOURCE_DIR}/painting/qwindowsurface_x11.cpp
)
if(WITH_X11 AND X11_FOUND)
set(GUI_HEADERS
${GUI_HEADERS}
${CMAKE_CURRENT_SOURCE_DIR}/painting/qpaintengine_x11_p.h
${CMAKE_CURRENT_SOURCE_DIR}/painting/qwindowsurface_x11_p.h
)
set(GUI_SOURCES
${GUI_SOURCES}
${CMAKE_CURRENT_SOURCE_DIR}/painting/qcolormap_x11.cpp
${CMAKE_CURRENT_SOURCE_DIR}/painting/qpaintdevice_x11.cpp
${CMAKE_CURRENT_SOURCE_DIR}/painting/qpaintengine_x11.cpp
${CMAKE_CURRENT_SOURCE_DIR}/painting/qwindowsurface_x11.cpp
)
endif()
if(WITH_CUPS AND CUPS_FOUND)
set(GUI_HEADERS
${GUI_HEADERS}
@ -132,4 +123,4 @@ if(WITH_CUPS AND CUPS_FOUND)
${CUPS_LIBRARIES}
)
include_directories(${CUPS_INCLUDE_DIR})
endif()
endif()

17
src/gui/text/text.cmake
View file

@ -40,6 +40,8 @@ set(GUI_HEADERS
${CMAKE_CURRENT_SOURCE_DIR}/text/qstatictext_p.h
${CMAKE_CURRENT_SOURCE_DIR}/text/qstatictext.h
${CMAKE_CURRENT_SOURCE_DIR}/text/qharfbuzz_p.h
${CMAKE_CURRENT_SOURCE_DIR}/text/qfontengine_x11_p.h
${CMAKE_CURRENT_SOURCE_DIR}/text/qfontdatabase_x11.h
)
set(GUI_SOURCES
@ -72,6 +74,8 @@ set(GUI_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/text/qzip.cpp
${CMAKE_CURRENT_SOURCE_DIR}/text/qtextodfwriter.cpp
${CMAKE_CURRENT_SOURCE_DIR}/text/qstatictext.cpp
${CMAKE_CURRENT_SOURCE_DIR}/text/qfont_x11.cpp
${CMAKE_CURRENT_SOURCE_DIR}/text/qfontengine_x11.cpp
)
if(WITH_FONTCONFIG AND FONTCONFIG_FOUND)
@ -92,19 +96,6 @@ if(WITH_FONTCONFIG AND FONTCONFIG_FOUND)
add_definitions(${FONTCONFIG_DEFINITIONS})
endif()
if(WITH_X11 AND X11_FOUND)
set(GUI_HEADERS
${GUI_HEADERS}
${CMAKE_CURRENT_SOURCE_DIR}/text/qfontengine_x11_p.h
${CMAKE_CURRENT_SOURCE_DIR}/text/qfontdatabase_x11.h
)
set(GUI_SOURCES
${GUI_SOURCES}
${CMAKE_CURRENT_SOURCE_DIR}/text/qfont_x11.cpp
${CMAKE_CURRENT_SOURCE_DIR}/text/qfontengine_x11.cpp
)
endif()
if(WITH_HARFBUZZ AND HARFBUZZ_FOUND)
set(EXTRA_GUI_LIBS
${EXTRA_GUI_LIBS}

8
src/gui/util/util.cmake
View file

@ -19,11 +19,5 @@ set(GUI_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/util/qundogroup.cpp
${CMAKE_CURRENT_SOURCE_DIR}/util/qundostack.cpp
${CMAKE_CURRENT_SOURCE_DIR}/util/qundoview.cpp
${CMAKE_CURRENT_SOURCE_DIR}/util/qsystemtrayicon_x11.cpp
)
if(WITH_X11 AND X11_FOUND)
set(GUI_SOURCES
${GUI_SOURCES}
${CMAKE_CURRENT_SOURCE_DIR}/util/qsystemtrayicon_x11.cpp
)
endif()