move package feature definitions to top-level CMake file

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1db1d2d..c0d68cc 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -510,6 +510,22 @@ if(NOT WITH_NAS OR NOT NAS_FOUND)
     katie_definition(-DQT_NO_NAS)
 endif()
 
+if(NOT WITH_PNG OR NOT PNG_FOUND)
+    katie_definition(-DQT_NO_IMAGEFORMAT_PNG)
+endif()
+
+if(NOT WITH_JPEG OR NOT JPEG_FOUND)
+    katie_definition(-DQT_NO_IMAGEFORMAT_JPEG)
+endif()
+
+if(NOT WITH_MNG OR NOT MNG_FOUND)
+    katie_definition(-DQT_NO_IMAGEFORMAT_MNG)
+endif()
+
+if(NOT WITH_TIFF OR NOT TIFF_FOUND)
+    katie_definition(-DQT_NO_IMAGEFORMAT_TIFF)
+endif()
+
 # semi-shared
 include(src/shared/linguist/linguist.cmake)
 include(src/shared/bootstrap.cmake)

diff --git a/src/gui/egl/egl.cmake b/src/gui/egl/egl.cmake
index 7ef33c4..a46fb19 100644 (file)
--- a/src/gui/egl/egl.cmake
+++ b/src/gui/egl/egl.cmake
@@ -32,6 +32,5 @@ else()
         ${CMAKE_CURRENT_SOURCE_DIR}/egl/qegl_stub.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/egl/qeglproperties_stub.cpp
     )
-    add_definitions(-DQT_NO_EGL)
 endif()
 

diff --git a/src/gui/image/image.cmake b/src/gui/image/image.cmake
index 5b2e005..bdbe0aa 100644 (file)
--- a/src/gui/image/image.cmake
+++ b/src/gui/image/image.cmake
@@ -91,8 +91,6 @@ if(WITH_PNG AND PNG_FOUND)
     )
     include_directories(${PNG_INCLUDE_DIRS})
     add_definitions(${PNG_DEFINITIONS})
-else()
-    add_definitions(-DQT_NO_IMAGEFORMAT_PNG)
 endif()
 
 if(WITH_JPEG AND JPEG_FOUND)
@@ -109,8 +107,6 @@ if(WITH_JPEG AND JPEG_FOUND)
         ${JPEG_LIBRARIES}
     )
     include_directories(${JPEG_INCLUDE_DIR})
-else()
-    add_definitions(-DQT_NO_IMAGEFORMAT_JPEG)
 endif()
 
 if(WITH_MNG AND MNG_FOUND)
@@ -127,8 +123,6 @@ if(WITH_MNG AND MNG_FOUND)
         ${MNG_LIBRARIES}
     )
     include_directories(${MNG_INCLUDES})
-else()
-    add_definitions(-DQT_NO_IMAGEFORMAT_MNG)
 endif()
 
 if(WITH_TIFF AND TIFF_FOUND)
@@ -145,8 +139,6 @@ if(WITH_TIFF AND TIFF_FOUND)
         ${TIFF_LIBRARIES}
     )
     include_directories(${TIFF_INCLUDE_DIR})
-else()
-    add_definitions(-DQT_NO_IMAGEFORMAT_TIFF)
 endif()
 
 if(KATIE_PLATFORM STREQUAL "win32")