summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFriedrich W. H. Kossebau <kossebau@kde.org>2016-08-07 14:38:08 (GMT)
committerFriedrich W. H. Kossebau <kossebau@kde.org>2016-08-07 17:11:37 (GMT)
commit67e3229152d55488d4af58010f1e65b0dc5570c7 (patch)
treea607ee2e8f8af260c10a1608b9936d0096ab6821
parent56615a95a71cd9140cfe06aa2b420a91bdeb98f1 (diff)
Use "marblewidget" target again instead of var ${MARBLEWIDGET}
Summary: It is just the targetname, use target property OUTPUT_NAME to control the actual library name Reviewers: rahn, sanjibanb, shentey, nienhueser, #marble Reviewed By: nienhueser, #marble Differential Revision: https://phabricator.kde.org/D2366
-rw-r--r--CMakeLists.txt2
-rw-r--r--MarbleMacros.cmake10
-rw-r--r--examples/cpp/animation-video/CMakeLists.txt2
-rw-r--r--examples/cpp/basic-routing/CMakeLists.txt2
-rw-r--r--examples/cpp/custom-layers/CMakeLists.txt2
-rw-r--r--examples/cpp/geopainter/CMakeLists.txt2
-rw-r--r--examples/cpp/hello-marble/CMakeLists.txt2
-rw-r--r--examples/cpp/kml-inspector/CMakeLists.txt2
-rw-r--r--examples/cpp/kml-screenshot/CMakeLists.txt2
-rw-r--r--examples/cpp/map-controls/CMakeLists.txt2
-rw-r--r--examples/cpp/map-properties/CMakeLists.txt2
-rw-r--r--examples/cpp/marble-game/CMakeLists.txt6
-rw-r--r--examples/cpp/marbleQuick2/CMakeLists.txt7
-rw-r--r--examples/cpp/overlay-rendering/CMakeLists.txt2
-rw-r--r--examples/cpp/pie-charts/CMakeLists.txt2
-rw-r--r--examples/cpp/reverse-geocoding/CMakeLists.txt2
-rw-r--r--examples/cpp/route-image/CMakeLists.txt2
-rw-r--r--examples/cpp/search/CMakeLists.txt2
-rw-r--r--examples/cpp/squad-interpolation/CMakeLists.txt2
-rw-r--r--examples/cpp/tour-preview/CMakeLists.txt2
-rw-r--r--examples/cpp/vehicletracking/CMakeLists.txt2
-rw-r--r--src/apps/behaim/CMakeLists.txt2
-rw-r--r--src/apps/marble-kde/CMakeLists.txt6
-rw-r--r--src/apps/marble-maps/CMakeLists.txt2
-rw-r--r--src/apps/marble-qt/CMakeLists.txt2
-rw-r--r--src/apps/marble-ui/CMakeLists.txt2
-rw-r--r--src/bindings/python/CMakeLists.txt2
-rw-r--r--src/lib/marble/CMakeLists.txt35
-rw-r--r--src/lib/marble/declarative/CMakeLists.txt2
-rw-r--r--src/plasmarunner/CMakeLists.txt2
-rw-r--r--src/plugins/designer/latloneditwidget/CMakeLists.txt2
-rw-r--r--src/plugins/runner/gpx/CMakeLists.txt2
-rw-r--r--src/thumbnailer/CMakeLists.txt2
-rw-r--r--tools/constellations2kml/CMakeLists.txt2
-rw-r--r--tools/dateline/CMakeLists.txt2
-rw-r--r--tools/kml2cache/CMakeLists.txt2
-rw-r--r--tools/kml2kml/CMakeLists.txt2
-rw-r--r--tools/mapreproject/CMakeLists.txt2
-rw-r--r--tools/maptheme-previewimage/CMakeLists.txt2
-rw-r--r--tools/mbtile-import/CMakeLists.txt2
-rw-r--r--tools/osm-addresses/CMakeLists.txt8
-rw-r--r--tools/osm-simplify/CMakeLists.txt2
-rw-r--r--tools/osm-sisyphus/CMakeLists.txt2
-rw-r--r--tools/poly2kml/CMakeLists.txt2
-rw-r--r--tools/shp2pn2/CMakeLists.txt2
-rw-r--r--tools/tilecreator-srtm2/CMakeLists.txt2
-rw-r--r--tools/tilecreator/CMakeLists.txt2
47 files changed, 82 insertions, 72 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ac36819..ae9236d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -120,8 +120,6 @@ if(QTONLY)
unset(QTONLY)
endif()
-set(MARBLEWIDGET marblewidget-qt5)
-
SET(CMAKE_AUTOMOC TRUE)
# Use M_PI under Windows
diff --git a/MarbleMacros.cmake b/MarbleMacros.cmake
index ab4f768..c1b60a9 100644
--- a/MarbleMacros.cmake
+++ b/MarbleMacros.cmake
@@ -37,7 +37,7 @@ macro( marble_add_plugin _target_name )
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 @@ qt_add_resources( _src ../../../apps/marble-ui/marble.qrc )
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 @@ macro( marble_add_test TEST_NAME )
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
index 657554a..d42d646 100644
--- a/examples/cpp/animation-video/CMakeLists.txt
+++ b/examples/cpp/animation-video/CMakeLists.txt
@@ -9,6 +9,6 @@ include_directories(
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
index 239b350..76bd1e3 100644
--- a/examples/cpp/basic-routing/CMakeLists.txt
+++ b/examples/cpp/basic-routing/CMakeLists.txt
@@ -9,7 +9,7 @@ include_directories(
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
index 482e20e..f81fe47 100644
--- a/examples/cpp/custom-layers/CMakeLists.txt
+++ b/examples/cpp/custom-layers/CMakeLists.txt
@@ -9,7 +9,7 @@ include_directories(
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
index f1b37c7..3e07e8d 100644
--- a/examples/cpp/geopainter/CMakeLists.txt
+++ b/examples/cpp/geopainter/CMakeLists.txt
@@ -9,7 +9,7 @@ include_directories(
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
index 630501b..c85a5dd 100644
--- a/examples/cpp/hello-marble/CMakeLists.txt
+++ b/examples/cpp/hello-marble/CMakeLists.txt
@@ -9,7 +9,7 @@ include_directories(
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
index c957636..7e78cec 100644
--- a/examples/cpp/kml-inspector/CMakeLists.txt
+++ b/examples/cpp/kml-inspector/CMakeLists.txt
@@ -9,7 +9,7 @@ include_directories(
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
index 533d0a4..7596ee9 100644
--- a/examples/cpp/kml-screenshot/CMakeLists.txt
+++ b/examples/cpp/kml-screenshot/CMakeLists.txt
@@ -9,6 +9,6 @@ include_directories(
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
index 8095871..f58c0a2 100644
--- a/examples/cpp/map-controls/CMakeLists.txt
+++ b/examples/cpp/map-controls/CMakeLists.txt
@@ -9,7 +9,7 @@ include_directories(
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
index db71994..862b13e 100644
--- a/examples/cpp/map-properties/CMakeLists.txt
+++ b/examples/cpp/map-properties/CMakeLists.txt
@@ -9,7 +9,7 @@ include_directories(
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
index 10f4e8c..6c8b18a 100644
--- a/examples/cpp/marble-game/CMakeLists.txt
+++ b/examples/cpp/marble-game/CMakeLists.txt
@@ -24,8 +24,10 @@ add_executable( ${TARGET} ${${TARGET}_SRCS} )
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
index 3941019..0e70bbb 100644
--- a/examples/cpp/marbleQuick2/CMakeLists.txt
+++ b/examples/cpp/marbleQuick2/CMakeLists.txt
@@ -11,8 +11,11 @@ set( ${TARGET}_SRC main.cpp)
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
index 7cf6812..2400701 100644
--- a/examples/cpp/overlay-rendering/CMakeLists.txt
+++ b/examples/cpp/overlay-rendering/CMakeLists.txt
@@ -9,7 +9,7 @@ include_directories(
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
index debd844..b1f9e16 100644
--- a/examples/cpp/pie-charts/CMakeLists.txt
+++ b/examples/cpp/pie-charts/CMakeLists.txt
@@ -9,6 +9,6 @@ include_directories(
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
index 7eee01b..c57d4b0 100644
--- a/examples/cpp/reverse-geocoding/CMakeLists.txt
+++ b/examples/cpp/reverse-geocoding/CMakeLists.txt
@@ -9,7 +9,7 @@ include_directories(
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
index e40b335..b2d9b6e 100644
--- a/examples/cpp/route-image/CMakeLists.txt
+++ b/examples/cpp/route-image/CMakeLists.txt
@@ -9,6 +9,6 @@ include_directories(
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
index 8afacf9..0e07d89 100644
--- a/examples/cpp/search/CMakeLists.txt
+++ b/examples/cpp/search/CMakeLists.txt
@@ -9,7 +9,7 @@ include_directories(
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
index 31b5a3c..fa627c6 100644
--- a/examples/cpp/squad-interpolation/CMakeLists.txt
+++ b/examples/cpp/squad-interpolation/CMakeLists.txt
@@ -9,7 +9,7 @@ include_directories(
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
index 47dcd92..ecb9692 100644
--- a/examples/cpp/tour-preview/CMakeLists.txt
+++ b/examples/cpp/tour-preview/CMakeLists.txt
@@ -9,6 +9,6 @@ include_directories(
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
index e81efa6..712c40a 100644
--- a/examples/cpp/vehicletracking/CMakeLists.txt
+++ b/examples/cpp/vehicletracking/CMakeLists.txt
@@ -9,7 +9,7 @@ include_directories(
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
index 01a7f37..5cef1e8 100644
--- a/src/apps/behaim/CMakeLists.txt
+++ b/src/apps/behaim/CMakeLists.txt
@@ -13,7 +13,7 @@ if (CMAKE_SYSTEM_NAME STREQUAL Android)
# 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
index eb6181b..8f1efe5 100644
--- a/src/apps/marble-kde/CMakeLists.txt
+++ b/src/apps/marble-kde/CMakeLists.txt
@@ -23,7 +23,9 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../marble-ui)
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 @@ add_executable (marble ${marble_kde_SRCS})
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
index 8f98cce..5e27a26 100644
--- a/src/apps/marble-maps/CMakeLists.txt
+++ b/src/apps/marble-maps/CMakeLists.txt
@@ -13,7 +13,7 @@ if (CMAKE_SYSTEM_NAME STREQUAL Android)
# 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
index 1f795fb..fff6b95 100644
--- a/src/apps/marble-qt/CMakeLists.txt
+++ b/src/apps/marble-qt/CMakeLists.txt
@@ -29,7 +29,7 @@ Qt5::Widgets
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
index 6dbffab..0026ed6 100644
--- a/src/apps/marble-ui/CMakeLists.txt
+++ b/src/apps/marble-ui/CMakeLists.txt
@@ -17,7 +17,7 @@ add_library (marbleui STATIC ${marble_SRCS})
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
index 8c1f299..57683cb 100644
--- a/src/bindings/python/CMakeLists.txt
+++ b/src/bindings/python/CMakeLists.txt
@@ -17,7 +17,7 @@ FILE(GLOB extra_files_sip sip/*.sip)
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
index 850680a..3d01823 100644
--- a/src/lib/marble/CMakeLists.txt
+++ b/src/lib/marble/CMakeLists.txt
@@ -359,22 +359,22 @@ qt_add_resources(marblewidget_SRCS libmarble.qrc ../../apps/marble-ui/marble.qrc
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,19 +387,19 @@ TARGET_LINK_LIBRARIES (${MARBLEWIDGET}
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}
)
@@ -408,42 +408,43 @@ 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
index 1f68fd8..9d8b4a6 100644
--- a/src/lib/marble/declarative/CMakeLists.txt
+++ b/src/lib/marble/declarative/CMakeLists.txt
@@ -42,8 +42,8 @@ marble_add_project_resources(qmldir)
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
index f1dd8aa..0abc3bb 100644
--- a/src/plasmarunner/CMakeLists.txt
+++ b/src/plasmarunner/CMakeLists.txt
@@ -25,7 +25,7 @@ ecm_create_qm_loader(plasmaRunner_SRCS marble_qt)
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
index b1f943c..c6cd197 100644
--- a/src/plugins/designer/latloneditwidget/CMakeLists.txt
+++ b/src/plugins/designer/latloneditwidget/CMakeLists.txt
@@ -7,8 +7,6 @@ INCLUDE_DIRECTORIES(
${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
index c776f17..e361789 100644
--- a/src/plugins/runner/gpx/CMakeLists.txt
+++ b/src/plugins/runner/gpx/CMakeLists.txt
@@ -43,7 +43,7 @@ if( BUILD_MARBLE_TESTS )
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
index d011cc5..be93e1b 100644
--- a/src/thumbnailer/CMakeLists.txt
+++ b/src/thumbnailer/CMakeLists.txt
@@ -18,7 +18,7 @@ set(marblethumbnail_SRCS
)
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
index 8832036..6a285e8 100644
--- a/tools/constellations2kml/CMakeLists.txt
+++ b/tools/constellations2kml/CMakeLists.txt
@@ -9,4 +9,4 @@ include_directories(
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
index 9ed68f6..77ed184 100644
--- a/tools/dateline/CMakeLists.txt
+++ b/tools/dateline/CMakeLists.txt
@@ -9,4 +9,4 @@ include_directories(
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
index fa5ccff..c835c8a 100644
--- a/tools/kml2cache/CMakeLists.txt
+++ b/tools/kml2cache/CMakeLists.txt
@@ -8,4 +8,4 @@ include_directories(
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
index 5827087..1b0283e 100644
--- a/tools/kml2kml/CMakeLists.txt
+++ b/tools/kml2kml/CMakeLists.txt
@@ -9,4 +9,4 @@ include_directories(
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
index 9745204..2c5d1a5 100644
--- a/tools/mapreproject/CMakeLists.txt
+++ b/tools/mapreproject/CMakeLists.txt
@@ -22,4 +22,4 @@ main.cpp
)
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
index 6013884..ab493bf 100644
--- a/tools/maptheme-previewimage/CMakeLists.txt
+++ b/tools/maptheme-previewimage/CMakeLists.txt
@@ -10,4 +10,4 @@ set( ${TARGET}_SRC main.cpp )
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
index b4fc383..ede9f2b 100644
--- a/tools/mbtile-import/CMakeLists.txt
+++ b/tools/mbtile-import/CMakeLists.txt
@@ -9,4 +9,4 @@ include_directories(
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
index 0e88b74..a558a1b 100644
--- a/tools/osm-addresses/CMakeLists.txt
+++ b/tools/osm-addresses/CMakeLists.txt
@@ -27,5 +27,9 @@ pbf/osmformat.proto
)
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
index 9160258..fa67201 100644
--- a/tools/osm-simplify/CMakeLists.txt
+++ b/tools/osm-simplify/CMakeLists.txt
@@ -38,4 +38,4 @@ WayChunk.cpp
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
index 89ca955..cb8d13d 100644
--- a/tools/osm-sisyphus/CMakeLists.txt
+++ b/tools/osm-sisyphus/CMakeLists.txt
@@ -18,4 +18,4 @@ main.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/poly2kml/CMakeLists.txt b/tools/poly2kml/CMakeLists.txt
index a77bbc5..6a5b377 100644
--- a/tools/poly2kml/CMakeLists.txt
+++ b/tools/poly2kml/CMakeLists.txt
@@ -9,4 +9,4 @@ include_directories(
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
index 7e75894..8022b18 100644
--- a/tools/shp2pn2/CMakeLists.txt
+++ b/tools/shp2pn2/CMakeLists.txt
@@ -9,4 +9,4 @@ include_directories(
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
index 0c0c6f9..dbbd3d9 100644
--- a/tools/tilecreator-srtm2/CMakeLists.txt
+++ b/tools/tilecreator-srtm2/CMakeLists.txt
@@ -10,7 +10,7 @@ set( ${TARGET}_SRC main.cpp tccore.cpp )
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
index 7d39b9b..61ca59a 100644
--- a/tools/tilecreator/CMakeLists.txt
+++ b/tools/tilecreator/CMakeLists.txt
@@ -9,4 +9,4 @@ include_directories(
set( ${TARGET}_SRC main.cpp tccore.cpp )
add_executable( ${TARGET} ${${TARGET}_SRC} )
-target_link_libraries( ${TARGET} marblewidget-qt5 )
+target_link_libraries(${TARGET} marblewidget)