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

move features definitions to top-level cmake file

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2015-12-15 18:15:10 +02:00
parent f7f98ba354
commit d11389c58a
5 changed files with 23 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
CMakeLists.txt
View file

@ -466,14 +466,33 @@ if(NOT WITH_OPENSSL OR NOT OPENSSL_FOUND)
katie_definition(-DQT_NO_OPENSSL) katie_definition(-DQT_NO_OPENSSL)
endif() endif()
if(NOT WITH_FREETYPE OR NOT FREETYPE_FOUND)
set(WITH_FONTCONFIG OFF)
katie_definition(-DQT_NO_FREETYPE)
endif()
if(NOT WITH_FONTCONFIG OR NOT FONTCONFIG_FOUND)
katie_definition(-DQT_NO_FONTCONFIG)
endif()
if(NOT WITH_DBUS OR NOT DBUS_FOUND)
katie_definition(-DQT_NO_DBUS)
endif()
if(NOT WITH_GLIB2 OR NOT GLIB2_FOUND)
katie_definition(-DQT_NO_GLIB)
endif()
if(NOT WITH_CUPS OR NOT CUPS_FOUND)
katie_definition(-DQT_NO_CUPS -DQT_NO_LPR)
endif()
# major components # major components
add_subdirectory(src/core) add_subdirectory(src/core)
add_subdirectory(src/xml) add_subdirectory(src/xml)
if(NOT KATIE_BOOTSTRAP) if(NOT KATIE_BOOTSTRAP)
if(WITH_DBUS AND DBUS_FOUND) if(WITH_DBUS AND DBUS_FOUND)
add_subdirectory(src/dbus) add_subdirectory(src/dbus)
else()
katie_definition(-DQT_NO_DBUS)
endif() endif()
add_subdirectory(src/declarative) add_subdirectory(src/declarative)
add_subdirectory(src/designer) add_subdirectory(src/designer)

2
cmake/modules/KatieMacros.cmake
View file

@ -103,6 +103,6 @@ macro(KATIE_TRANSLATIONS TRANSLATIONS)
endmacro() endmacro()
macro(KATIE_DEFINITION DEF) macro(KATIE_DEFINITION DEF)
set(KATIE_DEFINITIONS ${KATIE_DEFINITIONS} ${DEF}) set(KATIE_DEFINITIONS ${KATIE_DEFINITIONS} ${DEF} ${ARGN})
add_definitions(${DEF} ${ARGN}) add_definitions(${DEF} ${ARGN})
endmacro() endmacro()

2
src/core/CMakeLists.txt
View file

@ -304,8 +304,6 @@ if(WITH_GLIB2 AND GLIB2_FOUND)
${GLIB2_LIBRARIES} ${GLIB2_LIBRARIES}
) )
include_directories(${GLIB2_INCLUDE_DIR}) include_directories(${GLIB2_INCLUDE_DIR})
else()
katie_definition(-DQT_NO_GLIB)
endif() endif()

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

@ -254,7 +254,7 @@ if((UNIX OR KATIE_PLATFORM MATCHES "(qws|qpa)") AND WITH_CUPS AND CUPS_FOUND)
${CMAKE_CURRENT_SOURCE_DIR}/painting/qprinterinfo_unix.cpp ${CMAKE_CURRENT_SOURCE_DIR}/painting/qprinterinfo_unix.cpp
) )
if(WITH_QTOPIA) if(WITH_QTOPIA)
add_definitions(-DQT_NO_CUPS -DQT_NO_LPR) katie_definition(-DQT_NO_CUPS -DQT_NO_LPR)
else() else()
set(GUI_HEADERS set(GUI_HEADERS
${GUI_HEADERS} ${GUI_HEADERS}
@ -265,6 +265,4 @@ if((UNIX OR KATIE_PLATFORM MATCHES "(qws|qpa)") AND WITH_CUPS AND CUPS_FOUND)
${CMAKE_CURRENT_SOURCE_DIR}/painting/qcups.cpp ${CMAKE_CURRENT_SOURCE_DIR}/painting/qcups.cpp
) )
endif() endif()
else()
add_definitions(-DQT_NO_CUPS -DQT_NO_LPR -DQT_NO_PRINTER)
endif() endif()

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

@ -88,8 +88,6 @@ if(WITH_FREETYPE AND FREETYPE_FOUND)
${EXTRA_GUI_LIBS} ${EXTRA_GUI_LIBS}
${FREETYPE_LIBRARIES} ${FREETYPE_LIBRARIES}
) )
else()
add_definitions(-DQT_NO_FREETYPE)
endif() endif()
if(WITH_FONTCONFIG AND FONTCONFIG_FOUND) if(WITH_FONTCONFIG AND FONTCONFIG_FOUND)
@ -99,8 +97,6 @@ if(WITH_FONTCONFIG AND FONTCONFIG_FOUND)
${FONTCONFIG_LIBRARIES} ${FONTCONFIG_LIBRARIES}
) )
add_definitions(${FONTCONFIG_DEFINITIONS}) add_definitions(${FONTCONFIG_DEFINITIONS})
else()
add_definitions(-DQT_NO_FONTCONFIG)
endif() endif()
if(WITH_DIRECTWRITE) if(WITH_DIRECTWRITE)