build system cleanup

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 6ca30b2..0b6ec72 100644 (file)
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -301,6 +301,7 @@ include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}/tools
     ${CMAKE_CURRENT_BINARY_DIR}/xml
     ${ZLIB_INCLUDE_DIRS}
+    ${OPENSSL_INCLUDE_DIR}
 )
 
 if(WITH_GLIB2 AND GLIB2_FOUND)

diff --git a/src/network/CMakeLists.txt b/src/network/CMakeLists.txt
index 6a6517c..542449b 100644 (file)
--- a/src/network/CMakeLists.txt
+++ b/src/network/CMakeLists.txt
@@ -71,6 +71,7 @@ include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}/kernel
     ${CMAKE_CURRENT_BINARY_DIR}/socket
     ${CMAKE_CURRENT_BINARY_DIR}/ssl
+    ${OPENSSL_INCLUDE_DIR}
 )
 
 if(WITH_RESOLV AND RESOLV_FOUND)

diff --git a/src/network/ssl/ssl.cmake b/src/network/ssl/ssl.cmake
index 2d26bc3..93e3762 100644 (file)
--- a/src/network/ssl/ssl.cmake
+++ b/src/network/ssl/ssl.cmake
@@ -25,11 +25,3 @@ set(NETWORK_SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/ssl/qsslsocket.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/ssl/qsslsocket_openssl.cpp
 )
-
-if(WITH_OPENSSL AND OPENSSL_FOUND)
-    set(EXTRA_NETWORK_LIBS
-        ${EXTRA_NETWORK_LIBS}
-        ${OPENSSL_LIBRARIES}
-    )
-    include_directories(${OPENSSL_INCLUDE_DIR})
-endif()

diff --git a/src/svg/CMakeLists.txt b/src/svg/CMakeLists.txt
index fe417f6..2ce6d10 100644 (file)
--- a/src/svg/CMakeLists.txt
+++ b/src/svg/CMakeLists.txt
@@ -52,22 +52,9 @@ include_directories(
     ${CMAKE_SOURCE_DIR}/src/core/tools
     ${CMAKE_SOURCE_DIR}/src/gui/painting
     ${CMAKE_SOURCE_DIR}/src/3rdparty/harfbuzz/src
+    ${ZLIB_INCLUDE_DIRS}
 )
 
-if(WITH_ZLIB AND ZLIB_FOUND)
-    set(EXTRA_SVG_LIBS
-        ${EXTRA_SVG_LIBS}
-        ${ZLIB_LIBRARIES}
-    )
-    include_directories(${ZLIB_INCLUDE_DIRS})
-else()
-    set(SVG_SOURCES
-        ${SVG_SOURCES}
-        ${CMAKE_SOURCE_DIR}/src/3rdparty/miniz/miniz.c
-    )
-    include_directories(${CMAKE_SOURCE_DIR}/src/3rdparty/miniz)
-endif()
-
 katie_generate_misc("${SVG_HEADERS}" QtSvg)
 katie_generate_public("${SVG_PUBLIC_HEADERS}" QtSvg)
 katie_generate_package(KtSvg "KtCore KtGui")