diff --git a/src/designer/components/CMakeLists.txt b/src/designer/components/CMakeLists.txt index f5d087b32..3603f9797 100644 --- a/src/designer/components/CMakeLists.txt +++ b/src/designer/components/CMakeLists.txt @@ -1,6 +1,6 @@ add_definitions(-DQT_STATICPLUGIN) set(EXTRA_DESIGNERCOMPONENTS_LIBS - KtCore KtGui KtXml KtDesigner KtScript + KtCore KtGui KtXml KtDesigner KtScript KtUiTools ) include_directories( @@ -54,7 +54,7 @@ set(DESIGNERCOMPONENTS_HEADERS katie_generate_misc("${DESIGNERCOMPONENTS_HEADERS}" QtDesignerComponents) katie_generate_public("${DESIGNERCOMPONENTS_PUBLIC_HEADERS}" QtDesignerComponents) -katie_generate_package(KtDesignerComponents "KtCore KtGui KtXml KtDesigner KtScript") +katie_generate_package(KtDesignerComponents "KtCore KtGui KtXml KtDesigner KtScript KtUiTools") katie_setup_target(KtDesignerComponents ${DESIGNERCOMPONENTS_SOURCES} ${DESIGNERCOMPONENTS_HEADERS}) add_library(KtDesignerComponents ${KATIE_TYPE} ${KtDesignerComponents_SOURCES} diff --git a/src/network/CMakeLists.txt b/src/network/CMakeLists.txt index fa32ed544..6343a5fa9 100644 --- a/src/network/CMakeLists.txt +++ b/src/network/CMakeLists.txt @@ -2,6 +2,7 @@ set(EXTRA_NETWORK_LIBS KtCore ${OPENSSL_LIBRARIES} + ${ZLIB_LIBRARIES} ) set(NETWORK_PUBLIC_HEADERS @@ -48,6 +49,7 @@ include_directories( ${CMAKE_BINARY_DIR}/include/QtNetwork ${CMAKE_BINARY_DIR}/privateinclude/QtNetwork ${OPENSSL_INCLUDE_DIR} + ${ZLIB_INCLUDE_DIRS} ) include(access/access.cmake) diff --git a/src/script/CMakeLists.txt b/src/script/CMakeLists.txt index ca5d5acc1..d01332cc5 100644 --- a/src/script/CMakeLists.txt +++ b/src/script/CMakeLists.txt @@ -9,6 +9,7 @@ add_definitions( set(EXTRA_SCRIPT_LIBS KtCore ${PCRE_LIBRARIES} + ${CMAKE_THREAD_LIBS_INIT} ) set(SCRIPT_PUBLIC_HEADERS diff --git a/src/scripttools/CMakeLists.txt b/src/scripttools/CMakeLists.txt index 1a337f43a..f575d41b2 100644 --- a/src/scripttools/CMakeLists.txt +++ b/src/scripttools/CMakeLists.txt @@ -1,6 +1,6 @@ # add_definitions() set(EXTRA_SCRIPTTOOLS_LIBS - KtCore KtGui KtScript + KtCore KtXml KtGui KtScript ) set(SCRIPTTOOLS_PUBLIC_HEADERS @@ -29,7 +29,7 @@ set(SCRIPTTOOLS_HEADERS katie_generate_misc("${SCRIPTTOOLS_HEADERS}" QtScriptTools) katie_generate_public("${SCRIPTTOOLS_PUBLIC_HEADERS}" QtScriptTools) -katie_generate_package(KtScriptTools "KtCore KtGui KtScript") +katie_generate_package(KtScriptTools "KtCore KtXml KtGui KtScript") katie_setup_target(KtScriptTools ${SCRIPTTOOLS_SOURCES} ${SCRIPTTOOLS_HEADERS}) add_library(KtScriptTools ${KATIE_TYPE} ${KtScriptTools_SOURCES})