diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index d0c6322..57c12d1 100644
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -1,37 +1,42 @@
 set(common_src
     surveytargetexpression.cpp
     surveytargetexpressionevaluator.cpp
     surveytargetexpressionparser.cpp
 )
 
 if(HAVE_SURVEY_TARGET_EXPRESSIONS)
 
 if (CMAKE_VERSION VERSION_LESS 3.5.0)
     set(_flex_opts COMPILE_FLAGS --header-file=${CMAKE_CURRENT_BINARY_DIR}/surveytargetexpressionscanner.h)
     set(_bison_opts COMPILE_FLAGS --defines=${CMAKE_CURRENT_BINARY_DIR}/surveytargetexpressionparser_p.h)
 else()
     set(_flex_opts DEFINES_FILE ${CMAKE_CURRENT_BINARY_DIR}/surveytargetexpressionscanner.h)
     set(_bison_opts DEFINES_FILE ${CMAKE_CURRENT_BINARY_DIR}/surveytargetexpressionparser_p.h)
 endif()
 
 flex_target(surveytargetexpressionscanner
     surveytargetexpressionlexer.l
     ${CMAKE_CURRENT_BINARY_DIR}/surveytargetexpressionlexer.cpp
     ${_flex_opts}
 )
 bison_target(surveytargetexpressionparser
     surveytargetexpressionparser.y
     ${CMAKE_CURRENT_BINARY_DIR}/surveytargetexpressionparser_p.cpp
     ${_bison_opts}
 )
 add_flex_bison_dependency(surveytargetexpressionscanner surveytargetexpressionparser)
 endif()
 
 add_library(KUserFeedbackCommon STATIC
     ${common_src}
     ${BISON_surveytargetexpressionparser_OUTPUTS}
     ${FLEX_surveytargetexpressionscanner_OUTPUTS}
 )
 
+if (NOT BUILD_SHARED_LIBS)
+    install(TARGETS KUserFeedbackCommon
+            EXPORT KUserFeedbackTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
+endif()
+
 target_include_directories(KUserFeedbackCommon PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR};${CMAKE_CURRENT_SOURCE_DIR}/..>")
 target_link_libraries(KUserFeedbackCommon LINK_PRIVATE Qt5::Core)
diff --git a/src/provider/core/CMakeLists.txt b/src/provider/core/CMakeLists.txt
index e5fa533..732f342 100644
--- a/src/provider/core/CMakeLists.txt
+++ b/src/provider/core/CMakeLists.txt
@@ -1,75 +1,75 @@
 ecm_create_qm_loader(userfeedback_core_QM_LOADER userfeedbackprovider5_qt)
 
 set(userfeedback_core_srcs
     abstractdatasource.cpp
     applicationversionsource.cpp
     compilerinfosource.cpp
     cpuinfosource.cpp
     feedbackconfiguicontroller.cpp
     localeinfosource.cpp
     openglinfosource.cpp
     platforminfosource.cpp
     propertyratiosource.cpp
     provider.cpp
     qpainfosource.cpp
     qtversionsource.cpp
     screeninfosource.cpp
     selectionratiosource.cpp
     startcountsource.cpp
     surveyinfo.cpp
     usagetimesource.cpp
     auditloguicontroller.cpp
     ${userfeedback_core_QM_LOADER}
 )
 
-add_library(KUserFeedbackCore SHARED ${userfeedback_core_srcs})
+add_library(KUserFeedbackCore ${userfeedback_core_srcs})
 set_target_properties(KUserFeedbackCore PROPERTIES
     SOVERSION ${KUSERFEEDBACK_SOVERSION}
     VERSION ${KUSERFEEDBACK_VERSION_STRING}
 )
 generate_export_header(KUserFeedbackCore)
 
 target_link_libraries(KUserFeedbackCore PUBLIC Qt5::Core PRIVATE Qt5::Gui Qt5::Network)
 if(ANDROID)
     target_link_libraries(KUserFeedbackCore PRIVATE GLESv2)
 endif()
 target_compile_definitions(KUserFeedbackCore PRIVATE QT_DISABLE_DEPRECATED_BEFORE=0x050300)
 target_link_libraries(KUserFeedbackCore PRIVATE KUserFeedbackCommon)
 target_include_directories(KUserFeedbackCore PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR};${CMAKE_CURRENT_BINARY_DIR}>")
 target_include_directories(KUserFeedbackCore INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR}/KUserFeedback;${KDE_INSTALL_INCLUDEDIR}>")
 
 ecm_generate_headers(KUserFeedbackCore_HEADERS
     HEADER_NAMES
         AbstractDataSource
         ApplicationVersionSource
         CompilerInfoSource
         CpuInfoSource
         LocaleInfoSource
         OpenGLInfoSource
         PlatformInfoSource
         PropertyRatioSource
         Provider
         QPAInfoSource
         QtVersionSource
         ScreenInfoSource
         StartCountSource
         SurveyInfo
         UsageTimeSource
         FeedbackConfigUiController
     REQUIRED_HEADERS KUserFeedbackCore_HEADERS
 )
 
 install(TARGETS KUserFeedbackCore EXPORT KUserFeedbackTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
 install(FILES
     ${KUserFeedbackCore_HEADERS}
     ${CMAKE_CURRENT_BINARY_DIR}/kuserfeedbackcore_export.h
     DESTINATION ${KDE_INSTALL_INCLUDEDIR}/KUserFeedback
 )
 
 ecm_generate_pri_file(BASE_NAME KUserFeedbackCore
                       LIB_NAME KUserFeedbackCore
                       DEPS "core network"
                       FILENAME_VAR PRI_FILENAME
 )
 
 install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR})
diff --git a/src/provider/widgets/CMakeLists.txt b/src/provider/widgets/CMakeLists.txt
index 430a8e4..7ddac0a 100644
--- a/src/provider/widgets/CMakeLists.txt
+++ b/src/provider/widgets/CMakeLists.txt
@@ -1,45 +1,45 @@
 set(userfeedback_widgets_srcs
     feedbackconfigdialog.cpp
     feedbackconfigwidget.cpp
     notificationpopup.cpp
     styleinfosource.cpp
     auditlogbrowserdialog.cpp
 )
 
-add_library(KUserFeedbackWidgets SHARED ${userfeedback_widgets_srcs})
+add_library(KUserFeedbackWidgets ${userfeedback_widgets_srcs})
 set_target_properties(KUserFeedbackWidgets PROPERTIES
     SOVERSION ${KUSERFEEDBACK_SOVERSION}
     VERSION ${KUSERFEEDBACK_VERSION_STRING}
 )
 generate_export_header(KUserFeedbackWidgets)
 if(TARGET Qt5::Widgets)
     target_link_libraries(KUserFeedbackWidgets PUBLIC Qt5::Widgets KUserFeedbackCore)
 else()
     target_link_libraries(KUserFeedbackWidgets PUBLIC ${QT_QTGUI_LIBRARIES} KUserFeedbackCore)
 endif()
 target_include_directories(KUserFeedbackWidgets PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR};${CMAKE_CURRENT_BINARY_DIR}>")
 target_include_directories(KUserFeedbackWidgets INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR}/KUserFeedback;${KDE_INSTALL_INCLUDEDIR}>")
 
 ecm_generate_headers(KUserFeedbackWidgets_HEADERS
     HEADER_NAMES
         FeedbackConfigDialog
         FeedbackConfigWidget
         NotificationPopup
         StyleInfoSource
     REQUIRED_HEADERS KUserFeedbackWidgets_HEADERS
 )
 
 install(TARGETS KUserFeedbackWidgets EXPORT KUserFeedbackTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
 install(FILES
     ${KUserFeedbackWidgets_HEADERS}
     ${CMAKE_CURRENT_BINARY_DIR}/kuserfeedbackwidgets_export.h
     DESTINATION ${KDE_INSTALL_INCLUDEDIR}/KUserFeedback
 )
 
 ecm_generate_pri_file(BASE_NAME KUserFeedbackWidgets
                       LIB_NAME KUserFeedbackWidgets
                       DEPS "KUserFeedbackCore widgets"
                       FILENAME_VAR PRI_FILENAME
 )
 
 install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR})