Commit 67e32291 authored by Friedrich W. H. Kossebau's avatar Friedrich W. H. Kossebau
Browse files

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
parent 56615a95
......@@ -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 )
Supports Markdown
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