mirror of
https://bitbucket.org/smil3y/katie.git
synced 2025-02-25 03:12:56 +00:00
link compnents to libraries and other components explicitly
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
This commit is contained in:
parent
a7871caef5
commit
a8aea3ef4b
4 changed files with 7 additions and 4 deletions
|
@ -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}
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -9,6 +9,7 @@ add_definitions(
|
|||
set(EXTRA_SCRIPT_LIBS
|
||||
KtCore
|
||||
${PCRE_LIBRARIES}
|
||||
${CMAKE_THREAD_LIBS_INIT}
|
||||
)
|
||||
|
||||
set(SCRIPT_PUBLIC_HEADERS
|
||||
|
|
|
@ -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})
|
||||
|
|
Loading…
Add table
Reference in a new issue