minor build system cleanups

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

Author: fluxer

CMakeLists.txt

@@ -462,6 +462,10 @@ if(ENABLE_TESTING)
     add_definitions(-DQT_BUILD_INTERNAL)
 endif()
 
+if(NOT WITH_ZLIB OR NOT ZLIB_FOUND)
+    katie_definition(-DQT_NO_COMPRESS)
+endif()
+
 if(NOT WTIH_EGL OR NOT EGL_FOUND)
     katie_definition(-DQT_NO_EGL)
 endif()

src/core/CMakeLists.txt

@@ -1,5 +1,5 @@
 add_definitions(-DQT_BUILD_CORE_LIB)
-set(EXTRA_CORE_LIBS ${ZLIB_LIBRARIES})
+set(EXTRA_CORE_LIBS)
 
 set(CORE_PUBLIC_HEADERS
     ${CORE_PUBLIC_HEADERS}
@@ -306,6 +306,13 @@ if(WITH_GLIB2 AND GLIB2_FOUND)
     include_directories(${GLIB2_INCLUDE_DIR})
 endif()
 
+if(WITH_ZLIB AND ZLIB_FOUND)
+    set(EXTRA_CORE_LIBS
+        ${EXTRA_CORE_LIBS}
+        ${ZLIB_LIBRARIES}
+    )
+    include_directories(${ZLIB_INCLUDE_DIRS})
+endif()
 
 if(${KATIE_PLATFORM} STREQUAL "linux")
     set(EXTRA_CORE_LIBS

src/svg/CMakeLists.txt

@@ -60,8 +60,6 @@ if(WITH_ZLIB AND ZLIB_FOUND)
         ${ZLIB_LIBRARIES}
     )
     include_directories(${ZLIB_INCLUDE_DIRS})
-else()
-    katie_definition(-DQT_NO_COMPRESS)
 endif()
 
 katie_generate_misc("${SVG_HEADERS}" QtSvg)

src/tools/uic/CMakeLists.txt

@@ -6,8 +6,6 @@ include_directories(
     ${CMAKE_BINARY_DIR}/privateinclude
     ${CMAKE_BINARY_DIR}/include/QtCore
     ${CMAKE_BINARY_DIR}/privateinclude/QtCore
-    ${CMAKE_BINARY_DIR}/include/QtXml
-    ${CMAKE_BINARY_DIR}/privateinclude/QtXml
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}/cpp
     ${BOOTSTRAP_INCLUDES}