diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -120,8 +120,6 @@
   unset(QTONLY)
 endif()
 
-set(MARBLEWIDGET marblewidget-qt5)
-
 SET(CMAKE_AUTOMOC TRUE)
 
 # Use M_PI under Windows
diff --git a/MarbleMacros.cmake b/MarbleMacros.cmake
--- a/MarbleMacros.cmake
+++ b/MarbleMacros.cmake
@@ -37,7 +37,7 @@
 set( _src ${ARGN} )
 add_library( ${_target_name} MODULE ${_src} )
 target_link_libraries( ${_target_name} ${${_target_name}_LIBS}
-                                       ${MARBLEWIDGET} )
+                                       marblewidget )
 install( TARGETS ${_target_name} DESTINATION ${MARBLE_PLUGIN_INSTALL_PATH} )
 
 set_target_properties( ${_target_name} PROPERTIES 
@@ -57,7 +57,7 @@
 
 add_library( ${_target_name} MODULE ${_src} )
 target_link_libraries( ${_target_name} ${${_target_name}_LIBS}
-                                       ${MARBLEWIDGET} )
+                                       marblewidget )
 install( TARGETS ${_target_name} DESTINATION ${QT_PLUGINS_DIR}/designer )
 
 set_target_properties( ${_target_name} PROPERTIES 
@@ -84,8 +84,10 @@
         set( ${TEST_NAME}_SRCS ${CMAKE_CURRENT_BINARY_DIR}/${TEST_NAME}.moc ${${TEST_NAME}_SRCS} )
 
         add_executable( ${TEST_NAME} ${${TEST_NAME}_SRCS} )
-        target_link_libraries( ${TEST_NAME} ${MARBLEWIDGET} )
-        target_link_libraries( ${TEST_NAME} Qt5::Test )
+        target_link_libraries(${TEST_NAME}
+            marblewidget
+            Qt5::Test
+        )
 
         set_target_properties( ${TEST_NAME} PROPERTIES 
                                COMPILE_FLAGS "-DDATA_PATH=\"\\\"${DATA_PATH}\\\"\" -DPLUGIN_PATH=\"\\\"${PLUGIN_PATH}\\\"\"" )
diff --git a/examples/cpp/animation-video/CMakeLists.txt b/examples/cpp/animation-video/CMakeLists.txt
--- a/examples/cpp/animation-video/CMakeLists.txt
+++ b/examples/cpp/animation-video/CMakeLists.txt
@@ -9,6 +9,6 @@
 set( ${TARGET}_SRC main.cpp)
 add_executable( ${TARGET} ${${TARGET}_SRC} )
 
-target_link_libraries( ${TARGET} ${OpenCV_LIBS} ${MARBLEWIDGET} )
+target_link_libraries(${TARGET} ${OpenCV_LIBS} marblewidget)
 
 install( TARGETS ${TARGET} RUNTIME DESTINATION bin )
diff --git a/examples/cpp/basic-routing/CMakeLists.txt b/examples/cpp/basic-routing/CMakeLists.txt
--- a/examples/cpp/basic-routing/CMakeLists.txt
+++ b/examples/cpp/basic-routing/CMakeLists.txt
@@ -9,7 +9,7 @@
 set( ${TARGET}_SRC main.cpp)
 add_executable( ${TARGET} ${${TARGET}_SRC} )
 
-target_link_libraries( ${TARGET} ${MARBLEWIDGET} )
+target_link_libraries(${TARGET} marblewidget)
 
 install( TARGETS ${TARGET} RUNTIME DESTINATION ${MARBLE_EXAMPLES_INSTALL_DIR}/${TARGET} )
 install( FILES ${${TARGET}_SRC} Readme.txt DESTINATION ${MARBLE_EXAMPLES_INSTALL_DIR}/${TARGET} )
diff --git a/examples/cpp/custom-layers/CMakeLists.txt b/examples/cpp/custom-layers/CMakeLists.txt
--- a/examples/cpp/custom-layers/CMakeLists.txt
+++ b/examples/cpp/custom-layers/CMakeLists.txt
@@ -9,7 +9,7 @@
 set( ${TARGET}_SRC main.cpp)
 add_executable( ${TARGET} ${${TARGET}_SRC} )
 
-target_link_libraries( ${TARGET} ${MARBLEWIDGET} )
+target_link_libraries(${TARGET} marblewidget)
 
 install( TARGETS ${TARGET} RUNTIME DESTINATION ${MARBLE_EXAMPLES_INSTALL_DIR}/${TARGET} )
 install( FILES ${${TARGET}_SRC} Readme.txt DESTINATION ${MARBLE_EXAMPLES_INSTALL_DIR}/${TARGET} )
diff --git a/examples/cpp/geopainter/CMakeLists.txt b/examples/cpp/geopainter/CMakeLists.txt
--- a/examples/cpp/geopainter/CMakeLists.txt
+++ b/examples/cpp/geopainter/CMakeLists.txt
@@ -9,7 +9,7 @@
 set( ${TARGET}_SRC main.cpp)
 add_executable( ${TARGET} ${${TARGET}_SRC} )
 
-target_link_libraries( ${TARGET} ${MARBLEWIDGET} )
+target_link_libraries(${TARGET} marblewidget)
 
 install( TARGETS ${TARGET} RUNTIME DESTINATION ${MARBLE_EXAMPLES_INSTALL_DIR}/${TARGET} )
 install( FILES ${${TARGET}_SRC} Readme.txt DESTINATION ${MARBLE_EXAMPLES_INSTALL_DIR}/${TARGET} )
diff --git a/examples/cpp/hello-marble/CMakeLists.txt b/examples/cpp/hello-marble/CMakeLists.txt
--- a/examples/cpp/hello-marble/CMakeLists.txt
+++ b/examples/cpp/hello-marble/CMakeLists.txt
@@ -9,7 +9,7 @@
 set( ${TARGET}_SRC main.cpp)
 add_executable( ${TARGET} ${${TARGET}_SRC} )
 
-target_link_libraries( ${TARGET} ${MARBLEWIDGET} )
+target_link_libraries(${TARGET} marblewidget)
 
 install( TARGETS ${TARGET} RUNTIME DESTINATION ${MARBLE_EXAMPLES_INSTALL_DIR}/${TARGET} )
 install( FILES ${${TARGET}_SRC} Readme.txt DESTINATION ${MARBLE_EXAMPLES_INSTALL_DIR}/${TARGET} )
diff --git a/examples/cpp/kml-inspector/CMakeLists.txt b/examples/cpp/kml-inspector/CMakeLists.txt
--- a/examples/cpp/kml-inspector/CMakeLists.txt
+++ b/examples/cpp/kml-inspector/CMakeLists.txt
@@ -9,7 +9,7 @@
 set( ${TARGET}_SRC main.cpp)
 add_executable( ${TARGET} ${${TARGET}_SRC} )
 
-target_link_libraries( ${TARGET} ${MARBLEWIDGET} )
+target_link_libraries(${TARGET} marblewidget)
 
 install( TARGETS ${TARGET} RUNTIME DESTINATION ${MARBLE_EXAMPLES_INSTALL_DIR}/${TARGET} )
 install( FILES ${${TARGET}_SRC} Readme.txt DESTINATION ${MARBLE_EXAMPLES_INSTALL_DIR}/${TARGET} )
diff --git a/examples/cpp/kml-screenshot/CMakeLists.txt b/examples/cpp/kml-screenshot/CMakeLists.txt
--- a/examples/cpp/kml-screenshot/CMakeLists.txt
+++ b/examples/cpp/kml-screenshot/CMakeLists.txt
@@ -9,6 +9,6 @@
 set( ${TARGET}_SRC main.cpp)
 add_executable( ${TARGET} ${${TARGET}_SRC} )
 
-target_link_libraries( ${TARGET} ${MARBLEWIDGET} )
+target_link_libraries(${TARGET} marblewidget)
 
 install( TARGETS ${TARGET} RUNTIME DESTINATION bin )
diff --git a/examples/cpp/map-controls/CMakeLists.txt b/examples/cpp/map-controls/CMakeLists.txt
--- a/examples/cpp/map-controls/CMakeLists.txt
+++ b/examples/cpp/map-controls/CMakeLists.txt
@@ -9,7 +9,7 @@
 set( ${TARGET}_SRC main.cpp)
 add_executable( ${TARGET} ${${TARGET}_SRC} )
 
-target_link_libraries( ${TARGET} ${MARBLEWIDGET} )
+target_link_libraries(${TARGET} marblewidget)
 
 install( TARGETS ${TARGET} RUNTIME DESTINATION ${MARBLE_EXAMPLES_INSTALL_DIR}/${TARGET} )
 install( FILES ${${TARGET}_SRC} Readme.txt DESTINATION ${MARBLE_EXAMPLES_INSTALL_DIR}/${TARGET} )
diff --git a/examples/cpp/map-properties/CMakeLists.txt b/examples/cpp/map-properties/CMakeLists.txt
--- a/examples/cpp/map-properties/CMakeLists.txt
+++ b/examples/cpp/map-properties/CMakeLists.txt
@@ -9,7 +9,7 @@
 set( ${TARGET}_SRC main.cpp)
 add_executable( ${TARGET} ${${TARGET}_SRC} )
 
-target_link_libraries( ${TARGET} ${MARBLEWIDGET} )
+target_link_libraries(${TARGET} marblewidget)
 
 install( TARGETS ${TARGET} RUNTIME DESTINATION ${MARBLE_EXAMPLES_INSTALL_DIR}/${TARGET} )
 install( FILES ${${TARGET}_SRC} Readme.txt DESTINATION ${MARBLE_EXAMPLES_INSTALL_DIR}/${TARGET} )
diff --git a/examples/cpp/marble-game/CMakeLists.txt b/examples/cpp/marble-game/CMakeLists.txt
--- a/examples/cpp/marble-game/CMakeLists.txt
+++ b/examples/cpp/marble-game/CMakeLists.txt
@@ -24,8 +24,10 @@
 
 target_link_libraries(
     ${TARGET}
-    ${MARBLEWIDGET}
-    marbleui)
+    marblewidget
+    marbleui
+    Qt5::Quick
+)
 
 install( TARGETS ${TARGET} RUNTIME DESTINATION ${MARBLE_EXAMPLES_INSTALL_DIR}/${TARGET} )
 install( FILES ${${TARGET}_SRCS} DESTINATION ${MARBLE_EXAMPLES_INSTALL_DIR}/${TARGET} )
diff --git a/examples/cpp/marbleQuick2/CMakeLists.txt b/examples/cpp/marbleQuick2/CMakeLists.txt
--- a/examples/cpp/marbleQuick2/CMakeLists.txt
+++ b/examples/cpp/marbleQuick2/CMakeLists.txt
@@ -11,8 +11,11 @@
 qt5_add_resources(marble_QRCS marbleQuick2.qrc)
 add_executable( ${TARGET} ${${TARGET}_SRC} ${marble_QRCS} )
 
-target_link_libraries( ${TARGET} ${OpenCV_LIBRARIES} )
-target_link_libraries( ${TARGET} ${MARBLEWIDGET} marbledeclarative )
+target_link_libraries( ${TARGET}
+    ${OpenCV_LIBRARIES}
+    marblewidget
+    marbledeclarative
+)
 
 add_custom_command(TARGET ${TARGET} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different
                        ${CMAKE_CURRENT_SOURCE_DIR}/main.qml
diff --git a/examples/cpp/overlay-rendering/CMakeLists.txt b/examples/cpp/overlay-rendering/CMakeLists.txt
--- a/examples/cpp/overlay-rendering/CMakeLists.txt
+++ b/examples/cpp/overlay-rendering/CMakeLists.txt
@@ -9,7 +9,7 @@
 set( ${TARGET}_SRC main.cpp)
 add_executable( ${TARGET} ${${TARGET}_SRC} )
 
-target_link_libraries( ${TARGET} ${MARBLEWIDGET} )
+target_link_libraries(${TARGET} marblewidget)
 
 install( TARGETS ${TARGET} RUNTIME DESTINATION ${MARBLE_EXAMPLES_INSTALL_DIR}/${TARGET} )
 install( FILES ${${TARGET}_SRC} Readme.txt DESTINATION ${MARBLE_EXAMPLES_INSTALL_DIR}/${TARGET} )
diff --git a/examples/cpp/pie-charts/CMakeLists.txt b/examples/cpp/pie-charts/CMakeLists.txt
--- a/examples/cpp/pie-charts/CMakeLists.txt
+++ b/examples/cpp/pie-charts/CMakeLists.txt
@@ -9,6 +9,6 @@
 set( ${TARGET}_SRC main.cpp)
 add_executable( ${TARGET} ${${TARGET}_SRC} )
 
-target_link_libraries( ${TARGET} ${MARBLEWIDGET} )
+target_link_libraries(${TARGET} marblewidget)
 
 install( TARGETS ${TARGET} RUNTIME DESTINATION bin )
diff --git a/examples/cpp/reverse-geocoding/CMakeLists.txt b/examples/cpp/reverse-geocoding/CMakeLists.txt
--- a/examples/cpp/reverse-geocoding/CMakeLists.txt
+++ b/examples/cpp/reverse-geocoding/CMakeLists.txt
@@ -9,7 +9,7 @@
 set( ${TARGET}_SRC main.cpp)
 add_executable( ${TARGET} ${${TARGET}_SRC} )
 
-target_link_libraries( ${TARGET} ${MARBLEWIDGET} )
+target_link_libraries(${TARGET} marblewidget)
 
 install( TARGETS ${TARGET} RUNTIME DESTINATION ${MARBLE_EXAMPLES_INSTALL_DIR}/${TARGET} )
 install( FILES ${${TARGET}_SRC} Readme.txt DESTINATION ${MARBLE_EXAMPLES_INSTALL_DIR}/${TARGET} )
diff --git a/examples/cpp/route-image/CMakeLists.txt b/examples/cpp/route-image/CMakeLists.txt
--- a/examples/cpp/route-image/CMakeLists.txt
+++ b/examples/cpp/route-image/CMakeLists.txt
@@ -9,6 +9,6 @@
 set( ${TARGET}_SRC main.cpp)
 add_executable( ${TARGET} ${${TARGET}_SRC} )
 
-target_link_libraries( ${TARGET} ${MARBLEWIDGET} )
+target_link_libraries(${TARGET} marblewidget)
 
 install( TARGETS ${TARGET} RUNTIME DESTINATION bin )
diff --git a/examples/cpp/search/CMakeLists.txt b/examples/cpp/search/CMakeLists.txt
--- a/examples/cpp/search/CMakeLists.txt
+++ b/examples/cpp/search/CMakeLists.txt
@@ -9,7 +9,7 @@
 set( ${TARGET}_SRC main.cpp)
 add_executable( ${TARGET} ${${TARGET}_SRC} )
 
-target_link_libraries( ${TARGET} ${MARBLEWIDGET} )
+target_link_libraries(${TARGET} marblewidget)
 
 install( TARGETS ${TARGET} RUNTIME DESTINATION ${MARBLE_EXAMPLES_INSTALL_DIR}/${TARGET} )
 install( FILES ${${TARGET}_SRC} Readme.txt DESTINATION ${MARBLE_EXAMPLES_INSTALL_DIR}/${TARGET} )
diff --git a/examples/cpp/squad-interpolation/CMakeLists.txt b/examples/cpp/squad-interpolation/CMakeLists.txt
--- a/examples/cpp/squad-interpolation/CMakeLists.txt
+++ b/examples/cpp/squad-interpolation/CMakeLists.txt
@@ -9,7 +9,7 @@
 set( ${TARGET}_SRC squad-interpolation.cpp)
 add_executable( ${TARGET} ${${TARGET}_SRC} )
 
-target_link_libraries( ${TARGET} ${MARBLEWIDGET} )
+target_link_libraries(${TARGET} marblewidget)
 
 install( TARGETS ${TARGET} RUNTIME DESTINATION ${MARBLE_EXAMPLES_INSTALL_DIR}/${TARGET} )
 install( FILES ${${TARGET}_SRC} DESTINATION ${MARBLE_EXAMPLES_INSTALL_DIR}/${TARGET} )
diff --git a/examples/cpp/tour-preview/CMakeLists.txt b/examples/cpp/tour-preview/CMakeLists.txt
--- a/examples/cpp/tour-preview/CMakeLists.txt
+++ b/examples/cpp/tour-preview/CMakeLists.txt
@@ -9,6 +9,6 @@
 set( ${TARGET}_SRC tour-preview.cpp)
 add_executable( ${TARGET} ${${TARGET}_SRC} )
 
-target_link_libraries( ${TARGET} ${OpenCV_LIBS} ${MARBLEWIDGET} )
+target_link_libraries(${TARGET} ${OpenCV_LIBS} marblewidget)
 
 install( TARGETS ${TARGET} RUNTIME DESTINATION bin )
diff --git a/examples/cpp/vehicletracking/CMakeLists.txt b/examples/cpp/vehicletracking/CMakeLists.txt
--- a/examples/cpp/vehicletracking/CMakeLists.txt
+++ b/examples/cpp/vehicletracking/CMakeLists.txt
@@ -9,7 +9,7 @@
 set( ${TARGET}_SRC vehicletracking.cpp)
 add_executable( ${TARGET} ${${TARGET}_SRC} )
 
-target_link_libraries( ${TARGET} ${MARBLEWIDGET} )
+target_link_libraries(${TARGET} marblewidget)
 
 install( TARGETS ${TARGET} RUNTIME DESTINATION ${MARBLE_EXAMPLES_INSTALL_DIR}/${TARGET} )
 install( FILES ${${TARGET}_SRC} DESTINATION ${MARBLE_EXAMPLES_INSTALL_DIR}/${TARGET} )
diff --git a/src/apps/behaim/CMakeLists.txt b/src/apps/behaim/CMakeLists.txt
--- a/src/apps/behaim/CMakeLists.txt
+++ b/src/apps/behaim/CMakeLists.txt
@@ -13,7 +13,7 @@
     # while not directly linked, need to be listed here to have deployqt pick up those libs
     target_link_libraries (
         ${TARGET}
-        ${MARBLEWIDGET}
+        marblewidget
         astro
         Qt5::Concurrent
         Qt5::Xml
diff --git a/src/apps/marble-kde/CMakeLists.txt b/src/apps/marble-kde/CMakeLists.txt
--- a/src/apps/marble-kde/CMakeLists.txt
+++ b/src/apps/marble-kde/CMakeLists.txt
@@ -23,7 +23,9 @@
 kconfig_add_kcfg_files(marblepart_SRCS settings.kcfgc)
 add_library(marble_part ${marblepart_SRCS})
 set_target_properties(marble_part PROPERTIES PREFIX "${CMAKE_SHARED_LIBRARY_PREFIX}")
-target_link_libraries(marble_part marbleui ${MARBLEWIDGET}
+target_link_libraries(marble_part
+    marbleui
+    marblewidget
     KF5::NewStuff
     KF5::Parts
     KF5::CoreAddons
@@ -52,7 +54,7 @@
 target_link_libraries (
     marble
     marbleui
-    ${MARBLEWIDGET}
+    marblewidget
     astro
     KF5::NewStuff
     KF5::Parts
diff --git a/src/apps/marble-maps/CMakeLists.txt b/src/apps/marble-maps/CMakeLists.txt
--- a/src/apps/marble-maps/CMakeLists.txt
+++ b/src/apps/marble-maps/CMakeLists.txt
@@ -13,7 +13,7 @@
     # while not directly linked, need to be listed here to have deployqt pick up those libs
     target_link_libraries (
         ${TARGET}
-        ${MARBLEWIDGET}
+        marblewidget
         astro
         Qt5::Concurrent
         Qt5::Xml
diff --git a/src/apps/marble-qt/CMakeLists.txt b/src/apps/marble-qt/CMakeLists.txt
--- a/src/apps/marble-qt/CMakeLists.txt
+++ b/src/apps/marble-qt/CMakeLists.txt
@@ -29,7 +29,7 @@
 Qt5::PrintSupport
 Qt5::Network
 marbleui
-${MARBLEWIDGET}
+marblewidget
 astro)
 
 if(WIN32)
diff --git a/src/apps/marble-ui/CMakeLists.txt b/src/apps/marble-ui/CMakeLists.txt
--- a/src/apps/marble-ui/CMakeLists.txt
+++ b/src/apps/marble-ui/CMakeLists.txt
@@ -17,7 +17,7 @@
 target_link_libraries (
     marbleui
     LINK_PUBLIC
-        ${MARBLEWIDGET}
+        marblewidget
         Qt5::Widgets
         Qt5::PrintSupport
     LINK_PRIVATE
diff --git a/src/bindings/python/CMakeLists.txt b/src/bindings/python/CMakeLists.txt
--- a/src/bindings/python/CMakeLists.txt
+++ b/src/bindings/python/CMakeLists.txt
@@ -17,7 +17,7 @@
 set(SIP_EXTRA_FILES_DEPEND ${extra_files_sip})
 
 add_sip_python_module(PyKDE4.marble sip/marblemod.sip
-    ${MARBLEWIDGET}
+    marblewidget
     ${QT_QTCORE_LIBRARY}
     ${QT_QTGUI_LIBRARY}
     ${QT_QTUITOOLS_LIBRARY}
diff --git a/src/lib/marble/CMakeLists.txt b/src/lib/marble/CMakeLists.txt
--- a/src/lib/marble/CMakeLists.txt
+++ b/src/lib/marble/CMakeLists.txt
@@ -359,22 +359,22 @@
 
 qt_wrap_ui(marblewidget_SRCS ${marblewidget_UI})
 
-ADD_LIBRARY(${MARBLEWIDGET} SHARED ${marblewidget_SRCS} ${SOURCES_UI_HDRS})
+add_library(marblewidget SHARED ${marblewidget_SRCS} ${SOURCES_UI_HDRS})
 
-generate_export_header(${MARBLEWIDGET} BASE_NAME marble)
+generate_export_header(marblewidget BASE_NAME marble)
 
 
 # TODO: use PUBLIC/PRIVATE everywhere instead of LINK_PUBLIC/LINK_PRIVATE
 # once SailfishOS has cmake >= 2.8.12
 
 # link with libastro
-TARGET_LINK_LIBRARIES (${MARBLEWIDGET} LINK_PRIVATE astro)
+target_link_libraries(marblewidget LINK_PRIVATE astro)
 
 # link against zlib
-TARGET_LINK_LIBRARIES (${MARBLEWIDGET} LINK_PRIVATE ${ZLIB_LIBRARIES})
+target_link_libraries(marblewidget LINK_PRIVATE ${ZLIB_LIBRARIES})
 
 # link with release version of Qt libs
-TARGET_LINK_LIBRARIES (${MARBLEWIDGET}
+target_link_libraries(marblewidget
     LINK_PUBLIC
         Qt5::Xml
         Qt5::Gui
@@ -387,63 +387,64 @@
         Qt5::Concurrent
 )
 if (NOT MARBLE_NO_WEBKITWIDGETS)
-    TARGET_LINK_LIBRARIES (${MARBLEWIDGET}
+    target_link_libraries(marblewidget
         LINK_PUBLIC
             Qt5::WebKitWidgets
     )
 endif ()
 if (NOT MARBLE_NO_DBUS)
-    TARGET_LINK_LIBRARIES (${MARBLEWIDGET}
+    target_link_libraries(marblewidget
         LINK_PRIVATE
             Qt5::DBus
     )
 endif ()
 if (PHONON_FOUND)
-    TARGET_LINK_LIBRARIES (${MARBLEWIDGET}
+    target_link_libraries(marblewidget
         LINK_PRIVATE
             ${PHONON_LIBS}
     )
 endif()
 
 if (APPLE)
   # TODO: PUBLIC or can be PRIVATE?
   #defined in top level makefile
-  TARGET_LINK_LIBRARIES(${MARBLEWIDGET} LINK_PUBLIC ${MAC_EXTRA_LIBS} )
+  target_link_libraries(marblewidget LINK_PUBLIC ${MAC_EXTRA_LIBS} )
 endif (APPLE)
 
 # TODO: still supported?
 if (CMAKE_SYSTEM_NAME MATCHES "SunOS")
-  TARGET_LINK_LIBRARIES(${MARBLEWIDGET} LINK_PUBLIC m)
+  target_link_libraries(marblewidget LINK_PUBLIC m)
 endif (CMAKE_SYSTEM_NAME MATCHES "SunOS")
 
 if(WIN32)
   # TODO: PUBLIC or can be PRIVATE?
-  TARGET_LINK_LIBRARIES(${MARBLEWIDGET} LINK_PUBLIC ws2_32 imm32 winmm)
+  target_link_libraries(marblewidget LINK_PUBLIC ws2_32 imm32 winmm)
 endif(WIN32)
 
 if(NOT CMAKE_SYSTEM_NAME STREQUAL Android)
-  set_target_properties(${MARBLEWIDGET}  PROPERTIES
+  set_target_properties(marblewidget  PROPERTIES
     VERSION ${MARBLE_LIB_VERSION}
     SOVERSION ${MARBLE_ABI_VERSION}
   )
 endif()
 
-set_target_properties(${MARBLEWIDGET}  PROPERTIES
+set_target_properties(marblewidget  PROPERTIES
     EXPORT_NAME "Marble"
+    OUTPUT_NAME marblewidget-qt5
     COMPILE_FLAGS "-DKML_LAZY_IMP"
 )
 
-target_include_directories(${MARBLEWIDGET}
+target_include_directories(marblewidget
     INTERFACE "$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}>"
 )
 
 # choose the correct target install library path
 if(WIN32)
-  install(TARGETS ${MARBLEWIDGET} RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX} ARCHIVE DESTINATION lib)
+  install(TARGETS marblewidget RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX} ARCHIVE DESTINATION lib)
 elseif(APPLE)
-  install(TARGETS ${MARBLEWIDGET} LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/Marble.app/Contents/MacOS/lib)
+  install(TARGETS marblewidget LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/Marble.app/Contents/MacOS/lib)
 else()
-  install(TARGETS ${MARBLEWIDGET}
+  install(TARGETS marblewidget
     EXPORT MarbleTargets
     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
 endif()
diff --git a/src/lib/marble/declarative/CMakeLists.txt b/src/lib/marble/declarative/CMakeLists.txt
--- a/src/lib/marble/declarative/CMakeLists.txt
+++ b/src/lib/marble/declarative/CMakeLists.txt
@@ -42,8 +42,8 @@
 
 target_link_libraries( marbledeclarative
     LINK_PUBLIC
+        marblewidget
         Qt5::Quick
-        ${MARBLEWIDGET}
     LINK_PRIVATE
         Qt5::Script
 )
diff --git a/src/plasmarunner/CMakeLists.txt b/src/plasmarunner/CMakeLists.txt
--- a/src/plasmarunner/CMakeLists.txt
+++ b/src/plasmarunner/CMakeLists.txt
@@ -25,7 +25,7 @@
 
 add_library(plasma_runner_marble MODULE ${plasmaRunner_SRCS})
 target_link_libraries(plasma_runner_marble
-  ${MARBLEWIDGET}
+  marblewidget
   KF5::Runner
   KF5::I18n
 )
diff --git a/src/plugins/designer/latloneditwidget/CMakeLists.txt b/src/plugins/designer/latloneditwidget/CMakeLists.txt
--- a/src/plugins/designer/latloneditwidget/CMakeLists.txt
+++ b/src/plugins/designer/latloneditwidget/CMakeLists.txt
@@ -7,8 +7,6 @@
  ${Qt5Designer_INCLUDE_DIRS}
 )
 
-#target_link_libraries( ${MARBLEWIDGET} )
-
 set( latloneditplugin_SRCS LatLonEditPlugin.cpp )
 
 marble_add_designer_plugin( LatLonEditPlugin ${latloneditplugin_SRCS} )
diff --git a/src/plugins/runner/gpx/CMakeLists.txt b/src/plugins/runner/gpx/CMakeLists.txt
--- a/src/plugins/runner/gpx/CMakeLists.txt
+++ b/src/plugins/runner/gpx/CMakeLists.txt
@@ -43,7 +43,7 @@
 
     add_executable( TestTrack ${TestTrack_SRCS} )
     target_link_libraries( TestTrack Qt5::Test
-                                     ${MARBLEWIDGET} )
+                                     marblewidget )
     set_target_properties( TestTrack PROPERTIES
                             COMPILE_FLAGS "-DDATA_PATH=\"\\\"${DATA_PATH}\\\"\" -DPLUGIN_PATH=\"\\\"${PLUGIN_PATH}\\\"\"" )
     add_test( TestTrack TestTrack )
diff --git a/src/thumbnailer/CMakeLists.txt b/src/thumbnailer/CMakeLists.txt
--- a/src/thumbnailer/CMakeLists.txt
+++ b/src/thumbnailer/CMakeLists.txt
@@ -18,7 +18,7 @@
 )
 add_library(marblethumbnail MODULE ${marblethumbnail_SRCS})
 target_link_libraries(marblethumbnail
-  ${MARBLEWIDGET}
+  marblewidget
   KF5::KIOWidgets
 )
 install(TARGETS marblethumbnail  DESTINATION ${PLUGIN_INSTALL_DIR})
diff --git a/tools/constellations2kml/CMakeLists.txt b/tools/constellations2kml/CMakeLists.txt
--- a/tools/constellations2kml/CMakeLists.txt
+++ b/tools/constellations2kml/CMakeLists.txt
@@ -9,4 +9,4 @@
 set( ${TARGET}_SRC constellations2kml.cpp )
 add_executable( ${TARGET} ${${TARGET}_SRC} )
 
-target_link_libraries( ${TARGET} marblewidget-qt5 )
+target_link_libraries(${TARGET} marblewidget)
diff --git a/tools/dateline/CMakeLists.txt b/tools/dateline/CMakeLists.txt
--- a/tools/dateline/CMakeLists.txt
+++ b/tools/dateline/CMakeLists.txt
@@ -9,4 +9,4 @@
 set( ${TARGET}_SRC dateline.cpp )
 add_executable( ${TARGET} ${${TARGET}_SRC} )
 
-target_link_libraries( ${TARGET} marblewidget-qt5 )
+target_link_libraries(${TARGET} marblewidget)
diff --git a/tools/kml2cache/CMakeLists.txt b/tools/kml2cache/CMakeLists.txt
--- a/tools/kml2cache/CMakeLists.txt
+++ b/tools/kml2cache/CMakeLists.txt
@@ -8,4 +8,4 @@
 
 set( ${TARGET}_SRC kml2cache.cpp )
 add_executable( ${TARGET} ${${TARGET}_SRC} )
-target_link_libraries( ${TARGET} marblewidget-qt5 )
+target_link_libraries(${TARGET} marblewidget)
diff --git a/tools/kml2kml/CMakeLists.txt b/tools/kml2kml/CMakeLists.txt
--- a/tools/kml2kml/CMakeLists.txt
+++ b/tools/kml2kml/CMakeLists.txt
@@ -9,4 +9,4 @@
 set( ${TARGET}_SRC kml2kml.cpp )
 add_executable( ${TARGET} ${${TARGET}_SRC} )
 
-target_link_libraries( ${TARGET} marblewidget-qt5 )
+target_link_libraries(${TARGET} marblewidget)
diff --git a/tools/mapreproject/CMakeLists.txt b/tools/mapreproject/CMakeLists.txt
--- a/tools/mapreproject/CMakeLists.txt
+++ b/tools/mapreproject/CMakeLists.txt
@@ -22,4 +22,4 @@
 )
 add_executable( ${TARGET} ${${TARGET}_SRC} )
 
-target_link_libraries( ${TARGET} marblewidget-qt5 )
+target_link_libraries(${TARGET} marblewidget)
diff --git a/tools/maptheme-previewimage/CMakeLists.txt b/tools/maptheme-previewimage/CMakeLists.txt
--- a/tools/maptheme-previewimage/CMakeLists.txt
+++ b/tools/maptheme-previewimage/CMakeLists.txt
@@ -10,4 +10,4 @@
 QT_ADD_RESOURCES( RESOURCES canvas.qrc )
 add_executable( ${TARGET} ${${TARGET}_SRC} ${RESOURCES} )
 
-target_link_libraries( ${TARGET} marblewidget-qt5 )
+target_link_libraries(${TARGET} marblewidget)
diff --git a/tools/mbtile-import/CMakeLists.txt b/tools/mbtile-import/CMakeLists.txt
--- a/tools/mbtile-import/CMakeLists.txt
+++ b/tools/mbtile-import/CMakeLists.txt
@@ -9,4 +9,4 @@
 set( ${TARGET}_SRC mbtile-import.cpp MbTileWriter.cpp)
 add_executable( ${TARGET} ${${TARGET}_SRC} )
 
-target_link_libraries( ${TARGET} Qt5::Sql marblewidget-qt5 )
+target_link_libraries(${TARGET} marblewidget Qt5::Sql)
diff --git a/tools/osm-addresses/CMakeLists.txt b/tools/osm-addresses/CMakeLists.txt
--- a/tools/osm-addresses/CMakeLists.txt
+++ b/tools/osm-addresses/CMakeLists.txt
@@ -27,5 +27,9 @@
 )
 add_executable( ${TARGET} ${${TARGET}_SRC} ${PROTO_SRCS} ${PROTO_HDRS} )
 
-target_link_libraries( ${TARGET} ${PROTOBUF_LIBRARIES} ${ZLIB_LIBRARIES} )
-target_link_libraries( ${TARGET} Qt5::Sql marblewidget-qt5 )
+target_link_libraries( ${TARGET}
+    marblewidget
+    Qt5::Sql
+    ${PROTOBUF_LIBRARIES}
+    ${ZLIB_LIBRARIES}
+)
diff --git a/tools/osm-simplify/CMakeLists.txt b/tools/osm-simplify/CMakeLists.txt
--- a/tools/osm-simplify/CMakeLists.txt
+++ b/tools/osm-simplify/CMakeLists.txt
@@ -38,4 +38,4 @@
 
 add_executable( ${TARGET} ${${TARGET}_SRC} )
 
-target_link_libraries( ${TARGET} Qt5::Core marblewidget-qt5)
+target_link_libraries(${TARGET} marblewidget)
diff --git a/tools/osm-sisyphus/CMakeLists.txt b/tools/osm-sisyphus/CMakeLists.txt
--- a/tools/osm-sisyphus/CMakeLists.txt
+++ b/tools/osm-sisyphus/CMakeLists.txt
@@ -18,4 +18,4 @@
 )
 add_executable( ${TARGET} ${${TARGET}_SRC} )
 
-target_link_libraries( ${TARGET} Qt5::Sql marblewidget-qt5 )
+target_link_libraries(${TARGET} marblewidget Qt5::Sql)
diff --git a/tools/poly2kml/CMakeLists.txt b/tools/poly2kml/CMakeLists.txt
--- a/tools/poly2kml/CMakeLists.txt
+++ b/tools/poly2kml/CMakeLists.txt
@@ -9,4 +9,4 @@
 set( ${TARGET}_SRC main.cpp )
 add_executable( ${TARGET} ${${TARGET}_SRC} )
 
-target_link_libraries( ${TARGET} marblewidget-qt5 )
+target_link_libraries(${TARGET} marblewidget)
diff --git a/tools/shp2pn2/CMakeLists.txt b/tools/shp2pn2/CMakeLists.txt
--- a/tools/shp2pn2/CMakeLists.txt
+++ b/tools/shp2pn2/CMakeLists.txt
@@ -9,4 +9,4 @@
 set( ${TARGET}_SRC shp2pn2.cpp )
 add_executable( ${TARGET} ${${TARGET}_SRC} )
 
-target_link_libraries( ${TARGET} marblewidget-qt5 )
+target_link_libraries(${TARGET} marblewidget)
diff --git a/tools/tilecreator-srtm2/CMakeLists.txt b/tools/tilecreator-srtm2/CMakeLists.txt
--- a/tools/tilecreator-srtm2/CMakeLists.txt
+++ b/tools/tilecreator-srtm2/CMakeLists.txt
@@ -10,7 +10,7 @@
 add_definitions(-DTILECREATOR)
 add_executable( ${TARGET} ${${TARGET}_SRC} )
 
-target_link_libraries( ${TARGET} marblewidget-qt5 )
+target_link_libraries(${TARGET} marblewidget)
 
 if (APPLE)
   target_link_libraries (${TARGET} ${APP_SERVICES_LIBRARY})
diff --git a/tools/tilecreator/CMakeLists.txt b/tools/tilecreator/CMakeLists.txt
--- a/tools/tilecreator/CMakeLists.txt
+++ b/tools/tilecreator/CMakeLists.txt
@@ -9,4 +9,4 @@
 set( ${TARGET}_SRC main.cpp tccore.cpp )
 add_executable( ${TARGET} ${${TARGET}_SRC} )
 
-target_link_libraries( ${TARGET} marblewidget-qt5 )
+target_link_libraries(${TARGET} marblewidget)