move features definitions to top-level cmake file

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

CMakeLists.txt

@@ -466,14 +466,33 @@ if(NOT WITH_OPENSSL OR NOT OPENSSL_FOUND)
     katie_definition(-DQT_NO_OPENSSL)
 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
 add_subdirectory(src/core)
 add_subdirectory(src/xml)
 if(NOT KATIE_BOOTSTRAP)
     if(WITH_DBUS AND DBUS_FOUND)
         add_subdirectory(src/dbus)
-    else()
-        katie_definition(-DQT_NO_DBUS)
     endif()
     add_subdirectory(src/declarative)
     add_subdirectory(src/designer)

cmake/modules/KatieMacros.cmake

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

src/core/CMakeLists.txt

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

src/gui/painting/painting.cmake

@@ -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
     )
     if(WITH_QTOPIA)
-        add_definitions(-DQT_NO_CUPS -DQT_NO_LPR)
+        katie_definition(-DQT_NO_CUPS -DQT_NO_LPR)
     else()
         set(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
         )
     endif()
-else()
-    add_definitions(-DQT_NO_CUPS -DQT_NO_LPR -DQT_NO_PRINTER)
 endif()

src/gui/text/text.cmake

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