From 972266eaaac46e5d7ac24084a764ec9b5cc29867 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Mon, 20 Jun 2016 22:25:49 +0000 Subject: [PATCH] build plugins as modules Signed-off-by: Ivailo Monev --- src/plugins/accessible/widgets/widgets.cmake | 2 +- src/plugins/bearer/blackberry/blackberry.cmake | 5 ++--- src/plugins/bearer/connman/connman.cmake | 5 ++--- src/plugins/bearer/corewlan/corewlan.cmake | 9 +++++---- src/plugins/bearer/generic/generic.cmake | 5 ++--- src/plugins/bearer/icd/icd.cmake | 2 +- src/plugins/bearer/nativewifi/nativewifi.cmake | 5 ++--- src/plugins/bearer/networkmanager/networkmanager.cmake | 5 ++--- src/plugins/codecs/cn/cn.cmake | 2 +- src/plugins/codecs/jp/jp.cmake | 2 +- src/plugins/codecs/kr/kr.cmake | 2 +- src/plugins/codecs/tw/tw.cmake | 2 +- src/plugins/designer/qdeclarativeview/qdeclarativeview.cmake | 5 ++--- src/plugins/graphicssystems/meego/meego.cmake | 5 ++--- src/plugins/graphicssystems/opengl/opengl.cmake | 2 +- src/plugins/graphicssystems/trace/trace.cmake | 4 ++-- src/plugins/iconengines/svgiconengine/svgiconengine.cmake | 5 ++--- src/plugins/imageformats/gif/gif.cmake | 2 +- src/plugins/imageformats/ico/ico.cmake | 2 +- src/plugins/imageformats/jpeg/jpeg.cmake | 2 +- src/plugins/imageformats/mng/mng.cmake | 2 +- src/plugins/imageformats/svg/svg.cmake | 2 +- src/plugins/imageformats/tga/tga.cmake | 2 +- src/plugins/imageformats/tiff/tiff.cmake | 2 +- src/plugins/inputmethods/imsw-multi/imsw-multi.cmake | 5 ++--- src/plugins/platforms/blackberry/blackberry.cmake | 5 ++--- src/plugins/platforms/wayland/wayland.cmake | 5 ++--- src/plugins/platforms/xlib/xlib.cmake | 5 ++--- src/plugins/script/qtdbus/qtdbus.cmake | 2 +- 29 files changed, 46 insertions(+), 57 deletions(-) diff --git a/src/plugins/accessible/widgets/widgets.cmake b/src/plugins/accessible/widgets/widgets.cmake index 26f7cf082..16f5afed4 100644 --- a/src/plugins/accessible/widgets/widgets.cmake +++ b/src/plugins/accessible/widgets/widgets.cmake @@ -19,7 +19,7 @@ set(ACCESSIBLEWIDGETSPLUGIN_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/accessible/widgets/itemviews.cpp ) -add_library(qtaccessiblewidgetsplugin ${KATIE_TYPE} ${ACCESSIBLEWIDGETSPLUGIN_SOURCES} ${ACCESSIBLEWIDGETSPLUGIN_HEADERS}) +add_library(qtaccessiblewidgetsplugin MODULE ${ACCESSIBLEWIDGETSPLUGIN_SOURCES} ${ACCESSIBLEWIDGETSPLUGIN_HEADERS}) target_link_libraries(qtaccessiblewidgetsplugin KtCore KtGui) set_target_properties(qtaccessiblewidgetsplugin PROPERTIES OUTPUT_NAME qtaccessiblewidgets) target_include_directories(qtaccessiblewidgetsplugin PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/accessible/widgets) diff --git a/src/plugins/bearer/blackberry/blackberry.cmake b/src/plugins/bearer/blackberry/blackberry.cmake index 11893ad99..da67afbcf 100644 --- a/src/plugins/bearer/blackberry/blackberry.cmake +++ b/src/plugins/bearer/blackberry/blackberry.cmake @@ -15,10 +15,9 @@ set(QBBBEARERPLUGIN_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/bearer/qnetworksession_impl.cpp ) -katie_resources("${QBBBEARER_HEADERS}") -katie_resources("${QBBBEARERPLUGIN_SOURCES}") +katie_resources(${QBBBEARER_HEADERS} ${QBBBEARERPLUGIN_SOURCES}) -add_library(qbbbearerplugin ${KATIE_TYPE} ${QBBBEARERPLUGIN_SOURCES} ${QBBBEARER_HEADERS}) +add_library(qbbbearerplugin MODULE ${QBBBEARERPLUGIN_SOURCES} ${QBBBEARER_HEADERS}) set_target_properties(qbbbearerplugin PROPERTIES OUTPUT_NAME qbbbearer) install( diff --git a/src/plugins/bearer/connman/connman.cmake b/src/plugins/bearer/connman/connman.cmake index e1526e155..240b6fea9 100644 --- a/src/plugins/bearer/connman/connman.cmake +++ b/src/plugins/bearer/connman/connman.cmake @@ -20,10 +20,9 @@ set(QTCONNMANBEARERPLUGIN_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/bearer/qnetworksession_impl.cpp ) -katie_resources(${QTCONNMANBEARERPLUGIN_HEADERS}) -katie_resources(${QTCONNMANBEARERPLUGIN_SOURCES}) +katie_resources(${QTCONNMANBEARERPLUGIN_HEADERS} ${QTCONNMANBEARERPLUGIN_SOURCES}) -add_library(qconnmanbearerplugin ${KATIE_TYPE} ${QTCONNMANBEARERPLUGIN_SOURCES} ${QTCONNMANBEARERPLUGIN_HEADERS}) +add_library(qconnmanbearerplugin MODULE ${QTCONNMANBEARERPLUGIN_SOURCES} ${QTCONNMANBEARERPLUGIN_HEADERS}) target_link_libraries(qconnmanbearerplugin KtCore KtNetwork KtDBus) set_target_properties(qconnmanbearerplugin PROPERTIES OUTPUT_NAME qconnmanbearer) target_include_directories(qconnmanbearerplugin PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/bearer/connman ${CMAKE_CURRENT_SOURCE_DIR}/bearer) diff --git a/src/plugins/bearer/corewlan/corewlan.cmake b/src/plugins/bearer/corewlan/corewlan.cmake index 4d7af9697..c0e4890c1 100644 --- a/src/plugins/bearer/corewlan/corewlan.cmake +++ b/src/plugins/bearer/corewlan/corewlan.cmake @@ -12,12 +12,13 @@ set(QCOREWLANBEARERPLUGIN_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/bearer/qnetworksession_impl.cpp ) -katie_resources("${QCOREWLANBEARERPLUGIN_HEADERS}") -katie_resources("${QCOREWLANBEARERPLUGIN_SOURCES}") +katie_resources(${QCOREWLANBEARERPLUGIN_HEADERS} ${QCOREWLANBEARERPLUGIN_SOURCES}) -add_library(qcorewlanbearerplugin ${KATIE_TYPE} ${QCOREWLANBEARERPLUGIN_SOURCES} ${QCOREWLANBEARERPLUGIN_HEADERS}) +add_library(qcorewlanbearerplugin MODULE ${QCOREWLANBEARERPLUGIN_SOURCES} ${QCOREWLANBEARERPLUGIN_HEADERS}) set_target_properties(qcorewlanbearerplugin PROPERTIES OUTPUT_NAME qcorewlanbearer) -set_target_properties(qcorewlanbearerplugin PROPERTIES LINK_FLAGS "-framework Foundation -framework SystemConfiguration -framework CoreWLAN -framework Security") +set_target_properties(qcorewlanbearerplugin PROPERTIES + LINK_FLAGS "-framework Foundation -framework SystemConfiguration -framework CoreWLAN -framework Security" +) install( TARGETS qcorewlanbearerplugin diff --git a/src/plugins/bearer/generic/generic.cmake b/src/plugins/bearer/generic/generic.cmake index 86c69e2e7..551ee17ac 100644 --- a/src/plugins/bearer/generic/generic.cmake +++ b/src/plugins/bearer/generic/generic.cmake @@ -18,10 +18,9 @@ set(QGENERICBEARERPLUGIN_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/bearer/qnetworksession_impl.cpp ) -katie_resources(${QGENERICBEARERPLUGIN_HEADERS}) -katie_resources(${QGENERICBEARERPLUGIN_SOURCES}) +katie_resources(${QGENERICBEARERPLUGIN_HEADERS} ${QGENERICBEARERPLUGIN_SOURCES}) -add_library(qgenericbearerplugin ${KATIE_TYPE} ${QGENERICBEARERPLUGIN_SOURCES} ${QGENERICBEARERPLUGIN_HEADERS}) +add_library(qgenericbearerplugin MODULE ${QGENERICBEARERPLUGIN_SOURCES} ${QGENERICBEARERPLUGIN_HEADERS}) target_link_libraries(qgenericbearerplugin KtCore KtNetwork) set_target_properties(qgenericbearerplugin PROPERTIES OUTPUT_NAME qgenericbearer) diff --git a/src/plugins/bearer/icd/icd.cmake b/src/plugins/bearer/icd/icd.cmake index 035fb2f29..048051486 100644 --- a/src/plugins/bearer/icd/icd.cmake +++ b/src/plugins/bearer/icd/icd.cmake @@ -26,7 +26,7 @@ set(ICDPLUGIN_SOURCES katie_resources(${ICDPLUGIN_HEADERS} ${ICDPLUGIN_SOURCES}) -add_library(qicdbearerplugin ${KATIE_TYPE} ${ICDPLUGIN_SOURCES} ${ICDPLUGIN_HEADERS}) +add_library(qicdbearerplugin MODULE ${ICDPLUGIN_SOURCES} ${ICDPLUGIN_HEADERS}) set_target_properties(qicdbearerplugin PROPERTIES OUTPUT_NAME qicdbearer) target_include_directories(qicdbearerplugin PRIVATE ${CMAKE_SOURCE_DIR}/src/3rdparty/libgq) diff --git a/src/plugins/bearer/nativewifi/nativewifi.cmake b/src/plugins/bearer/nativewifi/nativewifi.cmake index df4a1f66a..1d2cd1526 100644 --- a/src/plugins/bearer/nativewifi/nativewifi.cmake +++ b/src/plugins/bearer/nativewifi/nativewifi.cmake @@ -18,10 +18,9 @@ set(QNATIVEWIFIPLUGIN_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/bearer/qnetworksession_impl.cpp ) -katie_resources("${QNATIVEWIFIPLUGIN_HEADERS}") -katie_resources("${QNATIVEWIFIPLUGIN_SOURCES}") +katie_resources(${QNATIVEWIFIPLUGIN_HEADERS} ${QNATIVEWIFIPLUGIN_SOURCES}) -add_library(qnativewifibearerplugin ${KATIE_TYPE} ${QNATIVEWIFIPLUGIN_SOURCES} ${QNATIVEWIFIPLUGIN_HEADERS}) +add_library(qnativewifibearerplugin MODULE ${QNATIVEWIFIPLUGIN_SOURCES} ${QNATIVEWIFIPLUGIN_HEADERS}) target_link_libraries(qnativewifibearerplugin KtCore KtNetwork) set_target_properties(qnativewifibearerplugin PROPERTIES OUTPUT_NAME qnativewifibearer) diff --git a/src/plugins/bearer/networkmanager/networkmanager.cmake b/src/plugins/bearer/networkmanager/networkmanager.cmake index 117f1ac46..c5ab50397 100644 --- a/src/plugins/bearer/networkmanager/networkmanager.cmake +++ b/src/plugins/bearer/networkmanager/networkmanager.cmake @@ -20,10 +20,9 @@ set(QNMBEARERPLUGIN_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/bearer/qnetworksession_impl.cpp ) -katie_resources("${QNMBEARERPLUGIN_HEADERS}") -katie_resources("${QNMBEARERPLUGIN_SOURCES}") +katie_resources(${QNMBEARERPLUGIN_HEADERS} ${QNMBEARERPLUGIN_SOURCES}) -add_library(qnmbearerplugin ${KATIE_TYPE} ${QNMBEARERPLUGIN_SOURCES} ${QNMBEARERPLUGIN_HEADERS}) +add_library(qnmbearerplugin MODULE ${QNMBEARERPLUGIN_SOURCES} ${QNMBEARERPLUGIN_HEADERS}) target_link_libraries(qnmbearerplugin KtCore KtNetwork KtDBus) set_target_properties(qnmbearerplugin PROPERTIES OUTPUT_NAME qnmbearer) diff --git a/src/plugins/codecs/cn/cn.cmake b/src/plugins/codecs/cn/cn.cmake index 060d8cf90..52ea2d841 100644 --- a/src/plugins/codecs/cn/cn.cmake +++ b/src/plugins/codecs/cn/cn.cmake @@ -8,7 +8,7 @@ set(CNCODECSPLUGIN_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/codecs/cn/qgb18030codec.cpp ) -add_library(qcncodecsplugin ${KATIE_TYPE} ${CNCODECSPLUGIN_SOURCES} ${CNCODECSPLUGIN_HEADERS}) +add_library(qcncodecsplugin MODULE ${CNCODECSPLUGIN_SOURCES} ${CNCODECSPLUGIN_HEADERS}) target_link_libraries(qcncodecsplugin KtCore) set_target_properties(qcncodecsplugin PROPERTIES OUTPUT_NAME qcncodecs) diff --git a/src/plugins/codecs/jp/jp.cmake b/src/plugins/codecs/jp/jp.cmake index 24afbac4a..bc9e49460 100644 --- a/src/plugins/codecs/jp/jp.cmake +++ b/src/plugins/codecs/jp/jp.cmake @@ -17,7 +17,7 @@ set(JPCODECSPLUGIN_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/codecs/jp/jpmain.cpp ) -add_library(qjpcodecsplugin ${KATIE_TYPE} ${JPCODECSPLUGIN_SOURCES} ${JPCODECSPLUGIN_HEADERS}) +add_library(qjpcodecsplugin MODULE ${JPCODECSPLUGIN_SOURCES} ${JPCODECSPLUGIN_HEADERS}) target_link_libraries(qjpcodecsplugin KtCore) set_target_properties(qjpcodecsplugin PROPERTIES OUTPUT_NAME qjpcodecs) diff --git a/src/plugins/codecs/kr/kr.cmake b/src/plugins/codecs/kr/kr.cmake index 9dceb6769..da9cad9ad 100644 --- a/src/plugins/codecs/kr/kr.cmake +++ b/src/plugins/codecs/kr/kr.cmake @@ -10,7 +10,7 @@ set(KRCODECSPLUGIN_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/codecs/kr/krmain.cpp ) -add_library(qkrcodecsplugin ${KATIE_TYPE} ${KRCODECSPLUGIN_SOURCES} ${KRCODECSPLUGIN_HEADERS}) +add_library(qkrcodecsplugin MODULE ${KRCODECSPLUGIN_SOURCES} ${KRCODECSPLUGIN_HEADERS}) target_link_libraries(qkrcodecsplugin KtCore) set_target_properties(qkrcodecsplugin PROPERTIES OUTPUT_NAME qkrcodecs) diff --git a/src/plugins/codecs/tw/tw.cmake b/src/plugins/codecs/tw/tw.cmake index e0058c5ec..48d4cd303 100644 --- a/src/plugins/codecs/tw/tw.cmake +++ b/src/plugins/codecs/tw/tw.cmake @@ -9,7 +9,7 @@ set(TWCODECSPLUGIN_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/codecs/tw/twmain.cpp ) -add_library(qtwcodecsplugin ${KATIE_TYPE} ${TWCODECSPLUGIN_SOURCES} ${TWCODECSPLUGIN_HEADERS}) +add_library(qtwcodecsplugin MODULE ${TWCODECSPLUGIN_SOURCES} ${TWCODECSPLUGIN_HEADERS}) target_link_libraries(qtwcodecsplugin KtCore) set_target_properties(qtwcodecsplugin PROPERTIES OUTPUT_NAME qtwcodecs) diff --git a/src/plugins/designer/qdeclarativeview/qdeclarativeview.cmake b/src/plugins/designer/qdeclarativeview/qdeclarativeview.cmake index 0b5228393..32aebc0af 100644 --- a/src/plugins/designer/qdeclarativeview/qdeclarativeview.cmake +++ b/src/plugins/designer/qdeclarativeview/qdeclarativeview.cmake @@ -10,10 +10,9 @@ set(QDECLARATIVEVIEWPLUGIN_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/designer/qdeclarativeview/qdeclarativeview_plugin.cpp ) -katie_resources("${QDECLARATIVEVIEWPLUGIN_HEADERS}") -katie_resources("${QDECLARATIVEVIEWPLUGIN_SOURCES}") +katie_resources(${QDECLARATIVEVIEWPLUGIN_HEADERS} ${QDECLARATIVEVIEWPLUGIN_SOURCES}) -add_library(qdeclarativeviewplugin ${KATIE_TYPE} ${QDECLARATIVEVIEWPLUGIN_SOURCES} ${QDECLARATIVEVIEWPLUGIN_HEADERS}) +add_library(qdeclarativeviewplugin MODULE ${QDECLARATIVEVIEWPLUGIN_SOURCES} ${QDECLARATIVEVIEWPLUGIN_HEADERS}) target_link_libraries(qdeclarativeviewplugin KtCore KtDeclarative KtDesigner) set_target_properties(qdeclarativeviewplugin PROPERTIES OUTPUT_NAME qdeclarativeview) target_compile_definitions(qdeclarativeviewplugin PRIVATE -DQDESIGNER_SDK_LIBRARY) diff --git a/src/plugins/graphicssystems/meego/meego.cmake b/src/plugins/graphicssystems/meego/meego.cmake index 31a83d476..9998daf45 100644 --- a/src/plugins/graphicssystems/meego/meego.cmake +++ b/src/plugins/graphicssystems/meego/meego.cmake @@ -24,10 +24,9 @@ set(QMEEGOGRAPHICSSYSTEMPLUGIN_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/graphicssystems/meego/dithering.cpp ) -katie_resources("${QMEEGOGRAPHICSSYSTEMPLUGIN_HEADERS}") -katie_resources("${QMEEGOGRAPHICSSYSTEMPLUGIN_SOURCES}") +katie_resources(${QMEEGOGRAPHICSSYSTEMPLUGIN_HEADERS} ${QMEEGOGRAPHICSSYSTEMPLUGIN_SOURCES}) -add_library(qmeegographicssystemplugin ${KATIE_TYPE} ${QMEEGOGRAPHICSSYSTEMPLUGIN_SOURCES} ${QMEEGOGRAPHICSSYSTEMPLUGIN_HEADERS}) +add_library(qmeegographicssystemplugin MODULE ${QMEEGOGRAPHICSSYSTEMPLUGIN_SOURCES} ${QMEEGOGRAPHICSSYSTEMPLUGIN_HEADERS}) set_target_properties(qmeegographicssystemplugin PROPERTIES OUTPUT_NAME qmeegographicssystem) install( diff --git a/src/plugins/graphicssystems/opengl/opengl.cmake b/src/plugins/graphicssystems/opengl/opengl.cmake index 22b6e3e7b..e0df3aa97 100644 --- a/src/plugins/graphicssystems/opengl/opengl.cmake +++ b/src/plugins/graphicssystems/opengl/opengl.cmake @@ -7,7 +7,7 @@ include_directories(${OPENGL_INCLUDE_DIR}) katie_resources(${QGLGRAPHICSSYSTEMPLUGIN_SOURCES}) -add_library(qglgraphicssystemplugin ${KATIE_TYPE} ${QGLGRAPHICSSYSTEMPLUGIN_SOURCES}) +add_library(qglgraphicssystemplugin MODULE ${QGLGRAPHICSSYSTEMPLUGIN_SOURCES}) target_link_libraries(qglgraphicssystemplugin KtCore KtGui KtOpenGL) set_target_properties(qglgraphicssystemplugin PROPERTIES OUTPUT_NAME qglgraphicssystem) diff --git a/src/plugins/graphicssystems/trace/trace.cmake b/src/plugins/graphicssystems/trace/trace.cmake index cf1379c9e..1ff22b664 100644 --- a/src/plugins/graphicssystems/trace/trace.cmake +++ b/src/plugins/graphicssystems/trace/trace.cmake @@ -4,9 +4,9 @@ set(QTRACEGRAPHICSSYSTEMPLUGIN_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/graphicssystems/trace/qgraphicssystem_trace.cpp ) -katie_resources("${QTRACEGRAPHICSSYSTEMPLUGIN_SOURCES}") +katie_resources(${QTRACEGRAPHICSSYSTEMPLUGIN_SOURCES}) -add_library(qtracegraphicssystemplugin ${KATIE_TYPE} ${QTRACEGRAPHICSSYSTEMPLUGIN_SOURCES}) +add_library(qtracegraphicssystemplugin MODULE ${QTRACEGRAPHICSSYSTEMPLUGIN_SOURCES}) target_link_libraries(qtracegraphicssystemplugin KtCore KtGui) set_target_properties(qtracegraphicssystemplugin PROPERTIES OUTPUT_NAME qtracegraphicssystem) diff --git a/src/plugins/iconengines/svgiconengine/svgiconengine.cmake b/src/plugins/iconengines/svgiconengine/svgiconengine.cmake index 152b56455..0532c3ccc 100644 --- a/src/plugins/iconengines/svgiconengine/svgiconengine.cmake +++ b/src/plugins/iconengines/svgiconengine/svgiconengine.cmake @@ -9,10 +9,9 @@ set(QSVGICONPLUGIN_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/iconengines/svgiconengine/qsvgiconengine.cpp ) -katie_resources("${QSVGICONPLUGIN_HEADERS}") -katie_resources("${QSVGICONPLUGIN_SOURCES}") +katie_resources(${QSVGICONPLUGIN_HEADERS} ${QSVGICONPLUGIN_SOURCES}) -add_library(qsvgiconplugin ${KATIE_TYPE} ${QSVGICONPLUGIN_SOURCES} ${QSVGICONPLUGIN_HEADERS}) +add_library(qsvgiconplugin MODULE ${QSVGICONPLUGIN_SOURCES} ${QSVGICONPLUGIN_HEADERS}) target_link_libraries(qsvgiconplugin KtCore KtGui KtSvg) set_target_properties(qsvgiconplugin PROPERTIES OUTPUT_NAME qsvgicon) diff --git a/src/plugins/imageformats/gif/gif.cmake b/src/plugins/imageformats/gif/gif.cmake index 5d1187b3a..13811e79f 100644 --- a/src/plugins/imageformats/gif/gif.cmake +++ b/src/plugins/imageformats/gif/gif.cmake @@ -4,7 +4,7 @@ set(QGIFPLUGIN_SOURCES ${CMAKE_SOURCE_DIR}/src/gui/image/qgifhandler.cpp ) -add_library(qgifplugin ${KATIE_TYPE} ${QGIFPLUGIN_SOURCES}) +add_library(qgifplugin MODULE ${QGIFPLUGIN_SOURCES}) target_link_libraries(qgifplugin KtCore KtGui) set_target_properties(qgifplugin PROPERTIES OUTPUT_NAME qgif) diff --git a/src/plugins/imageformats/ico/ico.cmake b/src/plugins/imageformats/ico/ico.cmake index a41f3afea..b8e054edb 100644 --- a/src/plugins/imageformats/ico/ico.cmake +++ b/src/plugins/imageformats/ico/ico.cmake @@ -9,7 +9,7 @@ set(QICOPLUGIN_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/imageformats/ico/qicohandler.cpp ) -add_library(qicoplugin ${KATIE_TYPE} ${QICOPLUGIN_SOURCES} ${QICOPLUGIN_HEADERS}) +add_library(qicoplugin MODULE ${QICOPLUGIN_SOURCES} ${QICOPLUGIN_HEADERS}) target_link_libraries(qicoplugin KtCore KtGui) set_target_properties(qicoplugin PROPERTIES OUTPUT_NAME qico) diff --git a/src/plugins/imageformats/jpeg/jpeg.cmake b/src/plugins/imageformats/jpeg/jpeg.cmake index a4e6b7e92..5fbc50dc8 100644 --- a/src/plugins/imageformats/jpeg/jpeg.cmake +++ b/src/plugins/imageformats/jpeg/jpeg.cmake @@ -4,7 +4,7 @@ set(QJPEGPLUGIN_SOURCES ${CMAKE_SOURCE_DIR}/src/gui/image/qjpeghandler.cpp ) -add_library(qjpegplugin ${KATIE_TYPE} ${QJPEGPLUGIN_SOURCES}) +add_library(qjpegplugin MODULE ${QJPEGPLUGIN_SOURCES}) target_link_libraries(qjpegplugin KtCore KtGui) set_target_properties(qjpegplugin PROPERTIES OUTPUT_NAME qjpeg) diff --git a/src/plugins/imageformats/mng/mng.cmake b/src/plugins/imageformats/mng/mng.cmake index 825456d12..c29a00963 100644 --- a/src/plugins/imageformats/mng/mng.cmake +++ b/src/plugins/imageformats/mng/mng.cmake @@ -4,7 +4,7 @@ set(QMNGPLUGIN_SOURCES ${CMAKE_SOURCE_DIR}/src/gui/image/qmnghandler.cpp ) -add_library(qmngplugin ${KATIE_TYPE} ${QMNGPLUGIN_SOURCES}) +add_library(qmngplugin MODULE ${QMNGPLUGIN_SOURCES}) target_link_libraries(qmngplugin KtCore KtGui) set_target_properties(qmngplugin PROPERTIES OUTPUT_NAME qmng) diff --git a/src/plugins/imageformats/svg/svg.cmake b/src/plugins/imageformats/svg/svg.cmake index 960d7577d..9675d5a79 100644 --- a/src/plugins/imageformats/svg/svg.cmake +++ b/src/plugins/imageformats/svg/svg.cmake @@ -9,7 +9,7 @@ set(QSVGPLUGIN_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/imageformats/svg/qsvgiohandler.cpp ) -add_library(qsvgplugin ${KATIE_TYPE} ${QSVGPLUGIN_SOURCES} ${QSVGPLUGIN_HEADERS}) +add_library(qsvgplugin MODULE ${QSVGPLUGIN_SOURCES} ${QSVGPLUGIN_HEADERS}) target_link_libraries(qsvgplugin KtCore KtGui KtSvg) set_target_properties(qsvgplugin PROPERTIES OUTPUT_NAME qsvg) diff --git a/src/plugins/imageformats/tga/tga.cmake b/src/plugins/imageformats/tga/tga.cmake index 727d5bb6f..39aff6142 100644 --- a/src/plugins/imageformats/tga/tga.cmake +++ b/src/plugins/imageformats/tga/tga.cmake @@ -11,7 +11,7 @@ set(QTGAPLUGIN_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/imageformats/tga/qtgafile.cpp ) -add_library(qtgaplugin ${KATIE_TYPE} ${QTGAPLUGIN_SOURCES} ${QTGAPLUGIN_HEADERS}) +add_library(qtgaplugin MODULE ${QTGAPLUGIN_SOURCES} ${QTGAPLUGIN_HEADERS}) target_link_libraries(qtgaplugin KtCore KtGui) set_target_properties(qtgaplugin PROPERTIES OUTPUT_NAME qtga) diff --git a/src/plugins/imageformats/tiff/tiff.cmake b/src/plugins/imageformats/tiff/tiff.cmake index da6888180..2a0cd9d91 100644 --- a/src/plugins/imageformats/tiff/tiff.cmake +++ b/src/plugins/imageformats/tiff/tiff.cmake @@ -4,7 +4,7 @@ set(QTIFFPLUGIN_SOURCES ${CMAKE_SOURCE_DIR}/src/gui/image/qtiffhandler.cpp ) -add_library(qtiffplugin ${KATIE_TYPE} ${QTIFFPLUGIN_SOURCES}) +add_library(qtiffplugin MODULE ${QTIFFPLUGIN_SOURCES}) target_link_libraries(qtiffplugin KtCore KtGui) set_target_properties(qtiffplugin PROPERTIES OUTPUT_NAME qtiff) diff --git a/src/plugins/inputmethods/imsw-multi/imsw-multi.cmake b/src/plugins/inputmethods/imsw-multi/imsw-multi.cmake index deeb51cf6..a4a96452c 100644 --- a/src/plugins/inputmethods/imsw-multi/imsw-multi.cmake +++ b/src/plugins/inputmethods/imsw-multi/imsw-multi.cmake @@ -14,10 +14,9 @@ set(QIMSWMULTIPLUGIN_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/inputmethods/imsw-multi/qmultiinputcontextplugin.cpp ) -katie_resources(${QIMSWMULTIPLUGIN_HEADERS}) -katie_resources(${QIMSWMULTIPLUGIN_SOURCES}) +katie_resources(${QIMSWMULTIPLUGIN_HEADERS} ${QIMSWMULTIPLUGIN_SOURCES}) -add_library(qimsw-multiplugin ${KATIE_TYPE} ${QIMSWMULTIPLUGIN_SOURCES} ${QIMSWMULTIPLUGIN_HEADERS}) +add_library(qimsw-multiplugin MODULE ${QIMSWMULTIPLUGIN_SOURCES} ${QIMSWMULTIPLUGIN_HEADERS}) target_link_libraries(qimsw-multiplugin KtCore KtGui) set_target_properties(qimsw-multiplugin PROPERTIES OUTPUT_NAME qimsw-multi) diff --git a/src/plugins/platforms/blackberry/blackberry.cmake b/src/plugins/platforms/blackberry/blackberry.cmake index cc839510d..bedde43cf 100644 --- a/src/plugins/platforms/blackberry/blackberry.cmake +++ b/src/plugins/platforms/blackberry/blackberry.cmake @@ -72,10 +72,9 @@ if(${KATIE_PLATFORM} STREQUAL "blackberry") ) endif() -katie_resources("${BLACKBERRYPLUGIN_SOURCES}") -katie_resources("${BLACKBERRYPLUGIN_HEADERS}") +katie_resources(${BLACKBERRYPLUGIN_SOURCES} ${BLACKBERRYPLUGIN_HEADERS}) -add_library(blackberryplugin ${KATIE_TYPE} ${BLACKBERRYPLUGIN_SOURCES} ${BLACKBERRYPLUGIN_HEADERS}) +add_library(blackberryplugin MODULE ${BLACKBERRYPLUGIN_SOURCES} ${BLACKBERRYPLUGIN_HEADERS}) set_target_properties(blackberryplugin PROPERTIES OUTPUT_NAME blackberry) target_link_libraries(blackberryplugin pps screen clipboard ${EGL_LIBRARIES}) target_compile_definitions(blackberryplugin ${BLACKBERRYPLUGIN_DEFINITIONS}) diff --git a/src/plugins/platforms/wayland/wayland.cmake b/src/plugins/platforms/wayland/wayland.cmake index 56ce59723..00c028962 100644 --- a/src/plugins/platforms/wayland/wayland.cmake +++ b/src/plugins/platforms/wayland/wayland.cmake @@ -42,10 +42,9 @@ set(WAYLANDPLUGIN_SOURCES include(gl_integration/gl_integration.cmake) include(windowmanager_integration/windowmanager_integration.cmake) -katie_resources("${WAYLANDPLUGIN_SOURCES}") -katie_resources("${WAYLANDPLUGIN_HEADERS}") +katie_resources(${WAYLANDPLUGIN_SOURCES} ${WAYLANDPLUGIN_HEADERS}) -add_library(qwaylandplugin ${KATIE_TYPE} ${WAYLANDPLUGIN_SOURCES} ${WAYLANDPLUGIN_HEADERS}) +add_library(qwaylandplugin MODULE ${WAYLANDPLUGIN_SOURCES} ${WAYLANDPLUGIN_HEADERS}) set_target_properties(qwaylandplugin PROPERTIES OUTPUT_NAME qwayland) target_compile_definitions(qwaylandplugin ${WAYLANDPLUGIN_DEFINITIONS}) target_include_directories(qwaylandplugin ${WAYLANDPLUGIN_INCLUDES}) diff --git a/src/plugins/platforms/xlib/xlib.cmake b/src/plugins/platforms/xlib/xlib.cmake index 6b253392a..d90fab1ec 100644 --- a/src/plugins/platforms/xlib/xlib.cmake +++ b/src/plugins/platforms/xlib/xlib.cmake @@ -86,10 +86,9 @@ if(${KATIE_PLATFORM} STREQUAL "mac") ) endif() -katie_resources("${QXLIBPLUGIN_SOURCES}") -katie_resources("${QXLIBPLUGIN_HEADERS}") +katie_resources(${QXLIBPLUGIN_SOURCES} ${QXLIBPLUGIN_HEADERS}) -add_library(qxlibplugin ${KATIE_TYPE} ${QXLIBPLUGIN_SOURCES} ${QXLIBPLUGIN_HEADERS}) +add_library(qxlibplugin MODULE ${QXLIBPLUGIN_SOURCES} ${QXLIBPLUGIN_HEADERS}) set_target_properties(qxlibplugin PROPERTIES OUTPUT_NAME qxlib) target_link_libraries(qxlibplugin ${EXTRA_QXLIB_LIBS}) target_include_directories(qxlibplugin PRIVATE ${QXLIBPLUGIN_INCLUDES}) diff --git a/src/plugins/script/qtdbus/qtdbus.cmake b/src/plugins/script/qtdbus/qtdbus.cmake index 2c12eef28..cb2af5fe1 100644 --- a/src/plugins/script/qtdbus/qtdbus.cmake +++ b/src/plugins/script/qtdbus/qtdbus.cmake @@ -14,7 +14,7 @@ set(QTDBUSPLUGIN_SOURCES katie_resources(${QTDBUSPLUGIN_HEADERS}) -add_library(qtscriptdbusplugin ${KATIE_TYPE} ${QTDBUSPLUGIN_SOURCES} ${QTDBUSPLUGIN_HEADERS}) +add_library(qtscriptdbusplugin MODULE ${QTDBUSPLUGIN_SOURCES} ${QTDBUSPLUGIN_HEADERS}) target_link_libraries(qtscriptdbusplugin KtCore KtDBus KtScript) set_target_properties(qtscriptdbusplugin PROPERTIES OUTPUT_NAME qtscriptdbus) target_include_directories(qtscriptdbusplugin PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/script/qtdbus) -- 2.11.0