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

# Conflicts:
#	tools/mbtile-import/CMakeLists.txt
parent 793c8e2b
......@@ -120,8 +120,6 @@ if(QTONLY)
unset(QTONLY)
endif()
set(MARBLEWIDGET marblewidget-qt5)
SET(CMAKE_AUTOMOC TRUE)
# Use M_PI under Windows
......
......@@ -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}\\\"\"" )
......
......@@ -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 )
......@@ -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} )
......
......@@ -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} )
......
......@@ -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} )
......
......@@ -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} )
......
......@@ -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} )
......
......@@ -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 )
......@@ -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} )
......
......@@ -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} )
......
......@@ -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} )
......
......@@ -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
......
......@@ -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} )
......
......@@ -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 )
......@@ -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} )
......
......@@ -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 )
......@@ -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} )
......
......@@ -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} )
......@@ -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 )
......@@ -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} )
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -29,7 +29,7 @@ Qt5::Widgets
Qt5::PrintSupport
Qt5::Network
marbleui
${MARBLEWIDGET}
marblewidget
astro)
if(WIN32)
......
......@@ -17,7 +17,7 @@ add_library (marbleui STATIC ${marble_SRCS})
target_link_libraries (
marbleui
LINK_PUBLIC
${MARBLEWIDGET}
marblewidget
Qt5::Widgets
Qt5::PrintSupport
LINK_PRIVATE
......
......@@ -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}
......
......@@ -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()
......
......@@ -42,8 +42,8 @@ marble_add_project_resources(qmldir)
target_link_libraries( marbledeclarative
LINK_PUBLIC
marblewidget
Qt5::Quick
${MARBLEWIDGET}
LINK_PRIVATE
Qt5::Script
)
......
......@@ -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
)
......
......@@ -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} )
......@@ -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 )
......
......@@ -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})
......@@ -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)
......@@ -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)
......@@ -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)
......@@ -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)
......@@ -22,4 +22,4 @@ main.cpp
)
add_executable( ${TARGET} ${${TARGET}_SRC} )
target_link_libraries( ${TARGET} marblewidget-qt5 )
target_link_libraries(${TARGET} marblewidget)
......@@ -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)
......@@ -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}
)
......@@ -35,4 +35,4 @@ BaseFilter.cpp
add_executable( ${TARGET} ${${TARGET}_SRC} )
target_link_libraries( ${TARGET} Qt5::Core marblewidget-qt5)
target_link_libraries(${TARGET} marblewidget)
......@@ -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)
......@@ -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)
......@@ -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)
......@@ -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})
......
......@@ -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)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment