diff --git a/CMakeLists.txt b/CMakeLists.txt index ac3681939..ae9236d75 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,320 +1,318 @@ cmake_minimum_required(VERSION 2.8.12) project(marble) #################################################### # CMake Settings SET(CMAKE_COLOR_MAKEFILE ON) # SET(CMAKE_SKIP_RPATH ON) set(CMAKE_POSITION_INDEPENDENT_CODE ON) # Let CMake find the correct library dir instead of # relying on the obsolete LIB_SUFFIX parameter include(GNUInstallDirs) # Taken from KDECompilerSettings.cmake: # Pick sensible versions of the C and C++ standards. # Note that MSVC does not have equivalent flags; the features are either # supported or they are not. if ("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_C_COMPILER_ID}" STREQUAL "Clang") # We use the C89 standard because that is what is common to all our # compilers (in particular, MSVC 2010 does not support C99) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=iso9899:1990") endif() if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x") elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel" AND NOT WIN32) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x") endif() # Default to hidden visibility for symbols set(CMAKE_C_VISIBILITY_PRESET hidden) set(CMAKE_CXX_VISIBILITY_PRESET hidden) set(CMAKE_VISIBILITY_INLINES_HIDDEN 1) if (POLICY CMP0063) cmake_policy(SET CMP0063 NEW) endif() #################################################### # Where to look first for cmake modules, # before ${CMAKE_ROOT}/Modules/ is checked set ( CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_SOURCE_DIR}/cmake_find_rules ${CMAKE_CURRENT_SOURCE_DIR}/cmake_scripts ${CMAKE_MODULE_PATH} ) # add cmake macros include(GenerateExportHeader) include( MarbleMacros ) #################################################### # Generate the tiles with the tilecreator at compile time # if this option is set, srtm.jpg will not be installed but the generated tiles instead option(MOBILE "Create a Marble version optimized for handheld devices") #################################################### # Build a D-Bus interface for the Marble widget # This is disabled by default for all win32, apple and Android if(WIN32 OR APPLE OR CMAKE_SYSTEM_NAME STREQUAL Android) option(BUILD_WITH_DBUS "Build the D-Bus interface for the Marble widget" OFF) else() option(BUILD_WITH_DBUS "Build the D-Bus interface for the Marble widget" ON) endif() ####################################################### # Specific options for building for different platforms if(CMAKE_SYSTEM_NAME STREQUAL Android) add_definitions(-DANDROID) # Minimum Qt version set(QT_REQUIRED_VERSION 5.3.0) SET(QT_QMAKE_EXECUTABLE "$ENV{Qt5_android}/bin/qmake") find_package(Qt5Location REQUIRED) find_package(Qt5Positioning REQUIRED) find_package(Qt5Multimedia REQUIRED) set ( MARBLE_NO_WEBKITWIDGETS TRUE ) else() find_package(Qt5WebKit) find_package(Qt5WebKitWidgets) if ( NOT Qt5WebKitWidgets_FOUND ) set ( MARBLE_NO_WEBKITWIDGETS TRUE ) endif() endif() find_package(Qt5Core REQUIRED) find_package(Qt5Xml REQUIRED) find_package(Qt5Network REQUIRED) find_package(Qt5Test REQUIRED) find_package(Qt5Script REQUIRED) find_package(Qt5Widgets REQUIRED) find_package(Qt5Svg REQUIRED) find_package(Qt5Sql REQUIRED) find_package(Qt5Concurrent REQUIRED) find_package(Qt5Quick REQUIRED) find_package(Qt5PrintSupport REQUIRED) if (BUILD_WITH_DBUS) find_package(Qt5DBus) if (NOT Qt5DBus_FOUND) set(MARBLE_NO_DBUS TRUE) endif() else() set(MARBLE_NO_DBUS TRUE) endif() if(QTONLY) # Forward the old QTONLY=TRUE option to the new WITH_KDE=FALSE # needs to be written to cache and forcefully, otherwise macro_optional_find_package's # option(WITH_${_name} ON) seems to operate on a shadowed variant of the variable set(WITH_KF5 FALSE CACHE BOOL "Search for KF5 package" FORCE) # And unset it quickly. Nobody shall use it anymore anywhere. # to detect if KDE _should_ be used (set by user): WITH_KDE but do not use it within src/lib/ unset(QTONLY) endif() -set(MARBLEWIDGET marblewidget-qt5) - SET(CMAKE_AUTOMOC TRUE) # Use M_PI under Windows if( WIN32 ) add_definitions( -D_USE_MATH_DEFINES ) endif( WIN32 ) #################################################### # build unit tests INCLUDE (CTest) ENABLE_TESTING() option( BUILD_MARBLE_TESTS "Build unit tests" ON ) add_feature_info("Unit tests" BUILD_MARBLE_TESTS "Build unit tests. Toggle with BUILD_MARBLE_TESTS=YES/NO. 'make test' will run all.") if( BUILD_MARBLE_TESTS ) # SET (TEST_DATA_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/tests/test_data") #where unit test binaries should be installed to and run from # SET (MARBLE_TEST_DIR ${CMAKE_CURRENT_BINARY_DIR}/tests) endif( BUILD_MARBLE_TESTS ) #################################################### set (PEDANTIC FALSE CACHE BOOL "Determines if we should compile with -Wall -Werror.") set (ENABLE_TESTS FALSE CACHE BOOL "Build unit tests?") set (WITH_DESIGNER_PLUGIN TRUE CACHE BOOL "Build plugins for Qt Designer") add_feature_info("Qt Designer plugins" WITH_DESIGNER_PLUGIN "Marble widget support in Qt Designer. Toggle with WITH_DESIGNER_PLUGIN=YES/NO") set(EXEC_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} CACHE PATH "Base directory for executables and libraries" FORCE) if (NOT QT_PLUGINS_DIR) set(QT_PLUGINS_DIR ${CMAKE_INSTALL_LIBDIR}/plugins) endif() #################################################### # Detect default for the user configurable MARBLE_DATA_PATH option if(WIN32) set(data_dir data) set(plugin_dir plugins) elseif(APPLE) # needed for finding bundle path in e.g. katlasdir.h FIND_LIBRARY(APP_SERVICES_LIBRARY ApplicationServices ) MARK_AS_ADVANCED (APP_SERVICES_LIBRARY) SET(MAC_EXTRA_LIBS ${APP_SERVICES_LIBRARY}) # for Mac OS X, everything is put inside an application bundle SET (CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX}/) # path for library references SET (CMAKE_INSTALL_NAME_DIR @executable_path/lib) # install the Info.plist file install(FILES src/mac/Info.plist DESTINATION ${CMAKE_INSTALL_PREFIX}/Marble.app/Contents) #SET (lib_dir ${CMAKE_INSTALL_PREFIX}/Marble.app/Contents/MacOS/lib) SET (data_dir ${CMAKE_INSTALL_PREFIX}/Marble.app/Contents/MacOS/resources/data) SET (plugin_dir ${CMAKE_INSTALL_PREFIX}/Marble.app/Contents/MacOS/resources/plugins) elseif(CMAKE_SYSTEM_NAME STREQUAL Android) set(plugin_dir "${CMAKE_INSTALL_PREFIX}/assets/plugins") set(data_dir "${CMAKE_INSTALL_PREFIX}/assets/data") else() # Linux / bsd etc... set(data_dir ${CMAKE_INSTALL_FULL_DATAROOTDIR}/marble/data) set(plugin_dir ${CMAKE_INSTALL_FULL_LIBDIR}/marble/plugins) endif() if(NOT ICON_INSTALL_DIR) set(ICON_INSTALL_DIR ${CMAKE_INSTALL_FULL_DATAROOTDIR}/icons) endif(NOT ICON_INSTALL_DIR) if(NOT APPS_INSTALL_DIR) set(APPS_INSTALL_DIR ${CMAKE_INSTALL_FULL_DATAROOTDIR}/applications) endif(NOT APPS_INSTALL_DIR) if(NOT INCLUDE_INSTALL_DIR) set(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include") endif() if (NOT MARBLE_DATA_PATH) set (MARBLE_DATA_PATH ${data_dir}) endif (NOT MARBLE_DATA_PATH) if (NOT MARBLE_PLUGIN_PATH) set (MARBLE_PLUGIN_PATH ${plugin_dir}) endif (NOT MARBLE_PLUGIN_PATH) if (NOT MARBLE_DATA_INSTALL_PATH) set (MARBLE_DATA_INSTALL_PATH ${MARBLE_DATA_PATH}) endif (NOT MARBLE_DATA_INSTALL_PATH) if (NOT MARBLE_PLUGIN_INSTALL_PATH) set (MARBLE_PLUGIN_INSTALL_PATH ${MARBLE_PLUGIN_PATH}) endif (NOT MARBLE_PLUGIN_INSTALL_PATH) #MESSAGE( STATUS, "MARBLE_PLUGIN_INSTALL_PATH: ${MARBLE_PLUGIN_INSTALL_PATH}" ) if(WIN32) set (STATIC_BUILD FALSE CACHE BOOL "Link to static Qt libs (win32 only)?") endif(WIN32) add_definitions( -DQT_USE_QSTRINGBUILDER -DQT_NO_SIGNALS_SLOTS_KEYWORDS -DQT_NO_URL_CAST_FROM_STRING -DQT_STRICT_ITERATORS ) #################################################### # Options for static build if(STATIC_BUILD) add_definitions(-DSTATIC_BUILD=1) endif(STATIC_BUILD) ############################################################# if (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_C_COMPILER MATCHES "icc") # Its good programming practice to build with no warnings... add_definitions( -Wall -Wextra -Wundef -Wnon-virtual-dtor -Woverloaded-virtual -Wno-long-long -Wchar-subscripts -Wcast-align -Wpointer-arith -Wformat-security ) # In pedantic mode, treat warnings as errors if (PEDANTIC) add_definitions( -Werror ) endif (PEDANTIC) endif (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_C_COMPILER MATCHES "icc") ############################################################# # Add a compiler def so that we can conditionally compile # code in debug mode only (e.g. extra console messages) IF (CMAKE_BUILD_TYPE MATCHES Debug) IF(NOT MINGW) ADD_DEFINITIONS(-DDEBUG) ELSE(NOT MINGW) REMOVE_DEFINITIONS( -DQT_NO_DEBUG ) ENDIF(NOT MINGW) ENDIF (CMAKE_BUILD_TYPE MATCHES Debug) #################################################### # on Win32 set the debug postfix if(WIN32) # distinguish between debug and release plugin SET(CMAKE_DEBUG_POSTFIX "d") endif(WIN32) #################################################### #################################################### # Add the include directories include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/marble ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/marble/projections ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/marble/geodata ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/marble/geodata/data ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/marble/geodata/graphicsitem ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/marble/geodata/handlers/dgml ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/marble/geodata/parser ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/marble/geodata/writer ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/marble/geodata/scene ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/marble/graphicsview ${CMAKE_CURRENT_BINARY_DIR}/src ${CMAKE_CURRENT_BINARY_DIR}/src/lib/marble ) #################################################### # Descend into subdirectories add_subdirectory(doc) add_subdirectory(src) add_subdirectory(data) include(DistTarget) add_subdirectory(tests) option(BUILD_MARBLE_TOOLS "Build various tools related to Marble" OFF) add_feature_info("Marble tools" BUILD_MARBLE_TOOLS "Build various Marble tools for e.g. file format conversion. Toggle with BUILD_MARBLE_TOOLS=YES/NO.") if(BUILD_MARBLE_TOOLS) add_subdirectory(tools) endif() option(BUILD_MARBLE_EXAMPLES "Build C++ examples showing how to use the Marble library" OFF) add_feature_info("Marble library C++ examples" BUILD_MARBLE_EXAMPLES "Build C++ examples showing how to use the Marble library. Toggle with BUILD_MARBLE_EXAMPLES=YES/NO.") if(BUILD_MARBLE_EXAMPLES) add_subdirectory(examples/cpp) endif() #################################################### # Install extra files install(FILES LICENSE.txt DESTINATION ${MARBLE_DATA_INSTALL_PATH}) ############################################################ # Uninstall stuff CONFIGURE_FILE( "${CMAKE_CURRENT_SOURCE_DIR}/cmake/templates/cmake_uninstall.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" IMMEDIATE @ONLY) ADD_CUSTOM_TARGET(uninstall "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake") include(MarbleCPackOptions) marble_feature_summary(WHAT ALL) diff --git a/MarbleMacros.cmake b/MarbleMacros.cmake index ab4f768cd..c1b60a9b5 100644 --- a/MarbleMacros.cmake +++ b/MarbleMacros.cmake @@ -1,159 +1,161 @@ include(FeatureSummary) if( COMMAND set_package_properties ) macro( marble_set_package_properties ) set_package_properties( ${ARGN} ) endmacro() else() macro( marble_set_package_properties ) # Just ignore it endmacro() endif() if ( COMMAND feature_summary ) macro( marble_feature_summary ) feature_summary( ${ARGN} ) endmacro() else() macro( marble_feature_summary ) # Just ignore it endmacro() endif() macro(qt_add_resources) qt5_add_resources(${ARGN}) endmacro() macro(qt_wrap_ui) qt5_wrap_ui(${ARGN}) endmacro() macro(qt_generate_moc) qt5_generate_moc(${ARGN}) endmacro() # the place to put in common cmake macros # this is needed to minimize the amount of errors to do 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 INSTALL_RPATH_USE_LINK_PATH TRUE SKIP_BUILD_RPATH TRUE BUILD_WITH_INSTALL_RPATH TRUE ) endmacro( marble_add_plugin _target_name ) # these plugins are slightly different macro( marble_add_designer_plugin _target_name ) set( _src ${ARGN} ) 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 INSTALL_RPATH_USE_LINK_PATH TRUE SKIP_BUILD_RPATH TRUE BUILD_WITH_INSTALL_RPATH TRUE ) endmacro( marble_add_designer_plugin _target_name ) if( WIN32 ) set( DATA_PATH ${CMAKE_INSTALL_PREFIX}/${MARBLE_DATA_PATH} ) set( PLUGIN_PATH ${CMAKE_INSTALL_PREFIX}/${MARBLE_PLUGIN_PATH} ) else( WIN32 ) set( DATA_PATH ${MARBLE_DATA_PATH} ) set( PLUGIN_PATH ${MARBLE_PLUGIN_PATH} ) endif( WIN32 ) macro( marble_add_test TEST_NAME ) if( BUILD_MARBLE_TESTS ) set( ${TEST_NAME}_SRCS ${TEST_NAME}.cpp ${ARGN} ) qt_generate_moc( ${TEST_NAME}.cpp ${CMAKE_CURRENT_BINARY_DIR}/${TEST_NAME}.moc ) include_directories( ${CMAKE_CURRENT_BINARY_DIR} ) 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}\\\"\"" ) add_test( ${TEST_NAME} ${TEST_NAME} ) endif( BUILD_MARBLE_TESTS ) endmacro( marble_add_test TEST_NAME ) macro( marble_add_project_resources resources ) add_custom_target( ${PROJECT_NAME}_Resources ALL SOURCES ${ARGN} ) endmacro() # - MACRO_OPTIONAL_FIND_PACKAGE() combines FIND_PACKAGE() with an OPTION() # MACRO_OPTIONAL_FIND_PACKAGE( [QUIT] ) # This macro is a combination of OPTION() and FIND_PACKAGE(), it # works like FIND_PACKAGE(), but additionally it automatically creates # an option name WITH_, which can be disabled via the cmake GUI. # or via -DWITH_=OFF # The standard _FOUND variables can be used in the same way # as when using the normal FIND_PACKAGE() # Copyright (c) 2006-2010 Alexander Neundorf, # # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. # This is just a helper macro to set a bunch of variables empty. # We don't know whether the package uses UPPERCASENAME or CamelCaseName, so we try both: if(NOT COMMAND _MOFP_SET_EMPTY_IF_DEFINED) macro(_MOFP_SET_EMPTY_IF_DEFINED _name _var) if(DEFINED ${_name}_${_var}) set(${_name}_${_var} "") endif(DEFINED ${_name}_${_var}) string(TOUPPER ${_name} _nameUpper) if(DEFINED ${_nameUpper}_${_var}) set(${_nameUpper}_${_var} "") endif(DEFINED ${_nameUpper}_${_var}) endmacro(_MOFP_SET_EMPTY_IF_DEFINED _package _var) endif() if(NOT COMMAND MACRO_OPTIONAL_FIND_PACKAGE) macro (MACRO_OPTIONAL_FIND_PACKAGE _name ) option(WITH_${_name} "Search for ${_name} package" ON) if (WITH_${_name}) find_package(${_name} ${ARGN}) else (WITH_${_name}) string(TOUPPER ${_name} _nameUpper) set(${_name}_FOUND FALSE) set(${_nameUpper}_FOUND FALSE) _mofp_set_empty_if_defined(${_name} INCLUDE_DIRS) _mofp_set_empty_if_defined(${_name} INCLUDE_DIR) _mofp_set_empty_if_defined(${_name} INCLUDES) _mofp_set_empty_if_defined(${_name} LIBRARY) _mofp_set_empty_if_defined(${_name} LIBRARIES) _mofp_set_empty_if_defined(${_name} LIBS) _mofp_set_empty_if_defined(${_name} FLAGS) _mofp_set_empty_if_defined(${_name} DEFINITIONS) endif (WITH_${_name}) endmacro (MACRO_OPTIONAL_FIND_PACKAGE) endif() # older cmake version don't have the add_feature_info macro. # It's just informative, so we add our own that does # nothing in that case if(NOT COMMAND ADD_FEATURE_INFO) macro(ADD_FEATURE_INFO) # just ignore it endmacro() endif() diff --git a/examples/cpp/animation-video/CMakeLists.txt b/examples/cpp/animation-video/CMakeLists.txt index 657554aaf..d42d646d4 100644 --- a/examples/cpp/animation-video/CMakeLists.txt +++ b/examples/cpp/animation-video/CMakeLists.txt @@ -1,14 +1,14 @@ SET (TARGET animation-video) PROJECT (${TARGET}) include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ) 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 239b3503a..76bd1e33a 100644 --- a/examples/cpp/basic-routing/CMakeLists.txt +++ b/examples/cpp/basic-routing/CMakeLists.txt @@ -1,16 +1,16 @@ SET (TARGET basic-routing) PROJECT (${TARGET}) include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ) 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} ) install( FILES CMakeLists.txt.external DESTINATION ${MARBLE_EXAMPLES_INSTALL_DIR}/${TARGET} RENAME CMakeLists.txt ) diff --git a/examples/cpp/custom-layers/CMakeLists.txt b/examples/cpp/custom-layers/CMakeLists.txt index 482e20e40..f81fe4780 100644 --- a/examples/cpp/custom-layers/CMakeLists.txt +++ b/examples/cpp/custom-layers/CMakeLists.txt @@ -1,16 +1,16 @@ SET (TARGET custom-layers) PROJECT (${TARGET}) include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ) 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} ) install( FILES CMakeLists.txt.external DESTINATION ${MARBLE_EXAMPLES_INSTALL_DIR}/${TARGET} RENAME CMakeLists.txt ) diff --git a/examples/cpp/geopainter/CMakeLists.txt b/examples/cpp/geopainter/CMakeLists.txt index f1b37c7f2..3e07e8dd9 100644 --- a/examples/cpp/geopainter/CMakeLists.txt +++ b/examples/cpp/geopainter/CMakeLists.txt @@ -1,16 +1,16 @@ SET (TARGET geopainter) PROJECT (${TARGET}) include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ) 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} ) install( FILES CMakeLists.txt.external DESTINATION ${MARBLE_EXAMPLES_INSTALL_DIR}/${TARGET} RENAME CMakeLists.txt ) diff --git a/examples/cpp/hello-marble/CMakeLists.txt b/examples/cpp/hello-marble/CMakeLists.txt index 630501bce..c85a5ddfe 100644 --- a/examples/cpp/hello-marble/CMakeLists.txt +++ b/examples/cpp/hello-marble/CMakeLists.txt @@ -1,16 +1,16 @@ SET (TARGET hello-marble) PROJECT (${TARGET}) include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ) 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} ) install( FILES CMakeLists.txt.external DESTINATION ${MARBLE_EXAMPLES_INSTALL_DIR}/${TARGET} RENAME CMakeLists.txt ) diff --git a/examples/cpp/kml-inspector/CMakeLists.txt b/examples/cpp/kml-inspector/CMakeLists.txt index c9576361e..7e78cece4 100644 --- a/examples/cpp/kml-inspector/CMakeLists.txt +++ b/examples/cpp/kml-inspector/CMakeLists.txt @@ -1,16 +1,16 @@ SET (TARGET kml-inspector) PROJECT (${TARGET}) include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ) 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} ) install( FILES CMakeLists.txt.external DESTINATION ${MARBLE_EXAMPLES_INSTALL_DIR}/${TARGET} RENAME CMakeLists.txt ) diff --git a/examples/cpp/kml-screenshot/CMakeLists.txt b/examples/cpp/kml-screenshot/CMakeLists.txt index 533d0a48a..7596ee9e1 100644 --- a/examples/cpp/kml-screenshot/CMakeLists.txt +++ b/examples/cpp/kml-screenshot/CMakeLists.txt @@ -1,14 +1,14 @@ SET (TARGET kml-screenshot) PROJECT (${TARGET}) include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ) 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 809587193..f58c0a233 100644 --- a/examples/cpp/map-controls/CMakeLists.txt +++ b/examples/cpp/map-controls/CMakeLists.txt @@ -1,16 +1,16 @@ SET (TARGET map-controls) PROJECT (${TARGET}) include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ) 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} ) install( FILES CMakeLists.txt.external DESTINATION ${MARBLE_EXAMPLES_INSTALL_DIR}/${TARGET} RENAME CMakeLists.txt ) diff --git a/examples/cpp/map-properties/CMakeLists.txt b/examples/cpp/map-properties/CMakeLists.txt index db719948d..862b13e25 100644 --- a/examples/cpp/map-properties/CMakeLists.txt +++ b/examples/cpp/map-properties/CMakeLists.txt @@ -1,16 +1,16 @@ SET (TARGET map-properties) PROJECT (${TARGET}) include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ) 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} ) install( FILES CMakeLists.txt.external DESTINATION ${MARBLE_EXAMPLES_INSTALL_DIR}/${TARGET} RENAME CMakeLists.txt ) diff --git a/examples/cpp/marble-game/CMakeLists.txt b/examples/cpp/marble-game/CMakeLists.txt index 10f4e8c54..6c8b18a2c 100644 --- a/examples/cpp/marble-game/CMakeLists.txt +++ b/examples/cpp/marble-game/CMakeLists.txt @@ -1,33 +1,35 @@ SET (TARGET marble-game) PROJECT (${TARGET}) include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ) set(${TARGET}_SRCS gamemain.cpp GameMainWindow.cpp CountryByShape.cpp CountryByFlag.cpp ClickOnThat.cpp ) FILE (GLOB QML_FILES *.qml) marble_add_project_resources(${QML_FILES}) qt_add_resources(${TARGET}_SRCS marbleGame.qrc) qt_wrap_ui(${TARGET}_SRCS game.ui) 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} ) install( FILES CMakeLists.txt.external DESTINATION ${MARBLE_EXAMPLES_INSTALL_DIR}/${TARGET} RENAME CMakeLists.txt ) install( FILES MapTackRoundHeadRed.png MapTackRoundHeadGreen.png DESTINATION ${MARBLE_EXAMPLES_INSTALL_DIR}/${TARGET} ) diff --git a/examples/cpp/marbleQuick2/CMakeLists.txt b/examples/cpp/marbleQuick2/CMakeLists.txt index 394101944..0e70bbb4f 100644 --- a/examples/cpp/marbleQuick2/CMakeLists.txt +++ b/examples/cpp/marbleQuick2/CMakeLists.txt @@ -1,24 +1,27 @@ SET (TARGET marbleQuick2) PROJECT (${TARGET}) include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ) 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 ${CMAKE_CURRENT_BINARY_DIR} ) install( TARGETS ${TARGET} RUNTIME DESTINATION ${MARBLE_EXAMPLES_INSTALL_DIR}/${TARGET} ) install( FILES ${${TARGET}_SRC} main.qml Readme.txt DESTINATION ${MARBLE_EXAMPLES_INSTALL_DIR}/${TARGET} ) install( FILES CMakeLists.txt.external DESTINATION ${MARBLE_EXAMPLES_INSTALL_DIR}/${TARGET} RENAME CMakeLists.txt ) diff --git a/examples/cpp/overlay-rendering/CMakeLists.txt b/examples/cpp/overlay-rendering/CMakeLists.txt index 7cf6812a7..2400701a8 100644 --- a/examples/cpp/overlay-rendering/CMakeLists.txt +++ b/examples/cpp/overlay-rendering/CMakeLists.txt @@ -1,16 +1,16 @@ SET (TARGET overlay-rendering) PROJECT (${TARGET}) include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ) 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} ) install( FILES CMakeLists.txt.external DESTINATION ${MARBLE_EXAMPLES_INSTALL_DIR}/${TARGET} RENAME CMakeLists.txt ) diff --git a/examples/cpp/pie-charts/CMakeLists.txt b/examples/cpp/pie-charts/CMakeLists.txt index debd84432..b1f9e1665 100644 --- a/examples/cpp/pie-charts/CMakeLists.txt +++ b/examples/cpp/pie-charts/CMakeLists.txt @@ -1,14 +1,14 @@ SET (TARGET pie-charts) PROJECT (${TARGET}) include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ) 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 7eee01bc2..c57d4b014 100644 --- a/examples/cpp/reverse-geocoding/CMakeLists.txt +++ b/examples/cpp/reverse-geocoding/CMakeLists.txt @@ -1,16 +1,16 @@ SET (TARGET reverse-geocoding) PROJECT (${TARGET}) include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ) 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} ) install( FILES CMakeLists.txt.external DESTINATION ${MARBLE_EXAMPLES_INSTALL_DIR}/${TARGET} RENAME CMakeLists.txt ) diff --git a/examples/cpp/route-image/CMakeLists.txt b/examples/cpp/route-image/CMakeLists.txt index e40b335ee..b2d9b6e28 100644 --- a/examples/cpp/route-image/CMakeLists.txt +++ b/examples/cpp/route-image/CMakeLists.txt @@ -1,14 +1,14 @@ SET (TARGET route-image) PROJECT (${TARGET}) include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ) 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 8afacf937..0e07d8998 100644 --- a/examples/cpp/search/CMakeLists.txt +++ b/examples/cpp/search/CMakeLists.txt @@ -1,16 +1,16 @@ SET (TARGET search) PROJECT (${TARGET}) include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ) 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} ) install( FILES CMakeLists.txt.external DESTINATION ${MARBLE_EXAMPLES_INSTALL_DIR}/${TARGET} RENAME CMakeLists.txt ) diff --git a/examples/cpp/squad-interpolation/CMakeLists.txt b/examples/cpp/squad-interpolation/CMakeLists.txt index 31b5a3c9f..fa627c6d8 100644 --- a/examples/cpp/squad-interpolation/CMakeLists.txt +++ b/examples/cpp/squad-interpolation/CMakeLists.txt @@ -1,15 +1,15 @@ SET (TARGET squad-interpolation) PROJECT (${TARGET}) include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ) 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 47dcd92e2..ecb969278 100644 --- a/examples/cpp/tour-preview/CMakeLists.txt +++ b/examples/cpp/tour-preview/CMakeLists.txt @@ -1,14 +1,14 @@ SET (TARGET tour-preview) PROJECT (${TARGET}) include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ) 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 e81efa683..712c40a01 100644 --- a/examples/cpp/vehicletracking/CMakeLists.txt +++ b/examples/cpp/vehicletracking/CMakeLists.txt @@ -1,15 +1,15 @@ SET (TARGET vehicletracking) PROJECT (${TARGET}) include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ) 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 01a7f37f9..5cef1e8c3 100644 --- a/src/apps/behaim/CMakeLists.txt +++ b/src/apps/behaim/CMakeLists.txt @@ -1,66 +1,66 @@ set(marble_SRCS main.cpp) qt5_add_resources(marble_QRCS MarbleBehaim.qrc) include_directories(${CMAKE_CURRENT_BINARY_DIR}) if (CMAKE_SYSTEM_NAME STREQUAL Android) set(TARGET MarbleBehaim) find_package(Qt5AndroidExtras) add_library (${TARGET} SHARED ${marble_SRCS} ${marble_QRCS}) # 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 Qt5::Widgets Qt5::PrintSupport Qt5::Network Qt5::Script Qt5::Sql Qt5::Svg Qt5::Location Qt5::Positioning Qt5::AndroidExtras Qt5::Multimedia ) else() set(TARGET marble-behaim) add_executable (${TARGET} ${marble_SRCS} ${marble_QRCS}) endif() target_link_libraries ( ${TARGET} marbledeclarative ) FILE(GLOB QML_FILES *.qml) add_custom_target(marble-behaim_resources ALL SOURCES ${QML_FILES} package/AndroidManifest.xml) if (CMAKE_SYSTEM_NAME STREQUAL Android) install(DIRECTORY "../../../data/android/" DESTINATION "${CMAKE_INSTALL_PREFIX}/res") set(ABSOLUTE_INSTALL_PATH "${CMAKE_INSTALL_PREFIX}") if(NOT IS_ABSOLUTE "${ABSOLUTE_INSTALL_PATH}") set(ABSOLUTE_INSTALL_PATH "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_PREFIX}") endif() get_filename_component(ABSOLUTE_INSTALL_PATH "${ABSOLUTE_INSTALL_PATH}" ABSOLUTE) get_filename_component(QT_ANDROID_QT_ROOT "${Qt5Core_DIR}/../../.." ABSOLUTE) set(ANDROID_SDK_ROOT $ENV{ANDROID_SDK_ROOT}) set(ANDROID_NDK_ROOT $ENV{ANDROID_NDK_ROOT}) set(QT_ANDROID_APP_PATH "${ABSOLUTE_INSTALL_PATH}/libs/${ANDROID_ABI}/libMarbleBehaim.so") set(QT_ANDROID_APP_EXTRA_LIBS "${ABSOLUTE_INSTALL_PATH}/lib/libastro.so,${ABSOLUTE_INSTALL_PATH}/lib/libmarblewidget-qt5.so,${ABSOLUTE_INSTALL_PATH}/lib/libmarbledeclarative.so") set(QT_ANDROID_APP_PACKAGE_SOURCE_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/package") set(QT_ANDROID_APP_PACKAGE_NAME "org.kde.marble.behaim") set(QT_ANDROID_APP_NAME "Marble Globe: Behaim's Erdapfel") configure_file(package/deploy-behaim.json.in ${CMAKE_CURRENT_BINARY_DIR}/deploy-behaim.json @ONLY) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/deploy-behaim.json DESTINATION "${CMAKE_INSTALL_PREFIX}/share") install(TARGETS ${TARGET} LIBRARY DESTINATION libs/${ANDROID_ABI}) else() if(MARBLE_INSTALL_ANDROID_APPS) install(TARGETS ${TARGET} RUNTIME DESTINATION bin) endif() endif() diff --git a/src/apps/marble-kde/CMakeLists.txt b/src/apps/marble-kde/CMakeLists.txt index eb6181bdd..8f1efe582 100644 --- a/src/apps/marble-kde/CMakeLists.txt +++ b/src/apps/marble-kde/CMakeLists.txt @@ -1,73 +1,75 @@ set(KDE_SKIP_UNINSTALL_TARGET ON CACHE BOOL "KDE uninstall target must be disabled") find_package(ECM QUIET) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH}) if(ECM_FOUND) include(KDEInstallDirs) include(KDECMakeSettings) include(ECMInstallIcons) endif() macro_optional_find_package(KF5 QUIET COMPONENTS Crash NewStuff Parts CoreAddons I18n) if (NOT KF5_FOUND) return() endif() set(marble_kde_SRCS kdemain.cpp KdeMainWindow.cpp marble_part.cpp ) set(marblepart_SRCS marble_part.cpp) 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 KF5::I18n ) install(TARGETS marble_part DESTINATION ${PLUGIN_INSTALL_DIR}) install(FILES marble_part.desktop DESTINATION ${SERVICES_INSTALL_DIR}) install(FILES marble_geo.desktop DESTINATION ${APPS_INSTALL_DIR}) install(FILES marble_worldwind.desktop DESTINATION ${APPS_INSTALL_DIR}) install(FILES marble_part.rc marbleui.rc marble.knsrc DESTINATION ${KXMLGUI_INSTALL_DIR}/marble) ki18n_wrap_ui(marble_kde_SRCS ${marble_UI}) kconfig_add_kcfg_files(marble_kde_SRCS settings.kcfgc) ecm_install_icons(ICONS "${CMAKE_CURRENT_SOURCE_DIR}/../../../data/icons/128-apps-marble.png" "${CMAKE_CURRENT_SOURCE_DIR}/../../../data/icons/16-apps-marble.png" "${CMAKE_CURRENT_SOURCE_DIR}/../../../data/icons/22-apps-marble.png" "${CMAKE_CURRENT_SOURCE_DIR}/../../../data/icons/32-apps-marble.png" "${CMAKE_CURRENT_SOURCE_DIR}/../../../data/icons/48-apps-marble.png" "${CMAKE_CURRENT_SOURCE_DIR}/../../../data/icons/64-apps-marble.png" DESTINATION ${ICON_INSTALL_DIR}) add_executable (marble ${marble_kde_SRCS}) target_link_libraries ( marble marbleui - ${MARBLEWIDGET} + marblewidget astro KF5::NewStuff KF5::Parts KF5::Crash KF5::CoreAddons KF5::I18n ) ## this works for win32 only because FindQt does not handle this correct if(STATIC_BUILD) target_link_libraries(marble ${QT_PLUGINS_DIR}/imageformats/qjpeg.lib) target_link_libraries(marble ${QT_PLUGINS_DIR}/imageformats/qsvg.lib) endif(STATIC_BUILD) install(TARGETS marble ${INSTALL_TARGETS_DEFAULT_ARGS}) install(PROGRAMS org.kde.marble.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) install(FILES org.kde.marble.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR}) install(FILES marble.kcfg DESTINATION ${KCFG_INSTALL_DIR}) diff --git a/src/apps/marble-maps/CMakeLists.txt b/src/apps/marble-maps/CMakeLists.txt index 8f98cce3a..5e27a266d 100644 --- a/src/apps/marble-maps/CMakeLists.txt +++ b/src/apps/marble-maps/CMakeLists.txt @@ -1,69 +1,69 @@ set(marble_SRCS main.cpp MarbleMaps.cpp TextToSpeechClient.cpp) qt5_add_resources(marble_QRCS MarbleMaps.qrc) include_directories(${CMAKE_CURRENT_BINARY_DIR}) if (CMAKE_SYSTEM_NAME STREQUAL Android) set(TARGET Marble) find_package(Qt5AndroidExtras) add_library (${TARGET} SHARED ${marble_SRCS} ${marble_QRCS}) # 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 Qt5::Widgets Qt5::PrintSupport Qt5::Network Qt5::Script Qt5::Sql Qt5::Svg Qt5::Location Qt5::Positioning Qt5::AndroidExtras Qt5::Multimedia ) else() set(TARGET marble-maps) add_executable (${TARGET} ${marble_SRCS} ${marble_QRCS}) endif() target_link_libraries ( ${TARGET} marbledeclarative ) FILE(GLOB QML_FILES *.qml) add_custom_target(marble-maps_resources ALL SOURCES ${QML_FILES} package/AndroidManifest.xml) if (CMAKE_SYSTEM_NAME STREQUAL Android) install(DIRECTORY "../../../data/android/" DESTINATION "${CMAKE_INSTALL_PREFIX}/res") set(ABSOLUTE_INSTALL_PATH "${CMAKE_INSTALL_PREFIX}") if(NOT IS_ABSOLUTE "${ABSOLUTE_INSTALL_PATH}") set(ABSOLUTE_INSTALL_PATH "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_PREFIX}") endif() get_filename_component(ABSOLUTE_INSTALL_PATH "${ABSOLUTE_INSTALL_PATH}" ABSOLUTE) get_filename_component(QT_ANDROID_QT_ROOT "${Qt5Core_DIR}/../../.." ABSOLUTE) set(ANDROID_SDK_ROOT $ENV{ANDROID_SDK_ROOT}) set(ANDROID_NDK_ROOT $ENV{ANDROID_NDK_ROOT}) set(QT_ANDROID_APP_PATH "${ABSOLUTE_INSTALL_PATH}/libs/${ANDROID_ABI}/libMarble.so") set(QT_ANDROID_APP_EXTRA_LIBS "${ABSOLUTE_INSTALL_PATH}/lib/libastro.so,${ABSOLUTE_INSTALL_PATH}/lib/libmarblewidget-qt5.so,${ABSOLUTE_INSTALL_PATH}/lib/libmarbledeclarative.so") set(QT_ANDROID_APP_PACKAGE_SOURCE_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/package") set(QT_ANDROID_APP_PACKAGE_NAME "org.kde.marble.maps") set(QT_ANDROID_APP_NAME "Marble Maps") configure_file(package/deploy-marble-maps.json.in ${CMAKE_CURRENT_BINARY_DIR}/deploy-marble-maps.json @ONLY) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/deploy-marble-maps.json DESTINATION "${CMAKE_INSTALL_PREFIX}/share") install(TARGETS ${TARGET} LIBRARY DESTINATION libs/${ANDROID_ABI}) else() if(MARBLE_INSTALL_ANDROID_APPS) if(APPS_INSTALL_DIR) install(PROGRAMS org.kde.marble.maps.desktop DESTINATION ${APPS_INSTALL_DIR}) endif(APPS_INSTALL_DIR) install(TARGETS ${TARGET} RUNTIME DESTINATION bin) endif() endif() diff --git a/src/apps/marble-qt/CMakeLists.txt b/src/apps/marble-qt/CMakeLists.txt index 1f795fbab..fff6b958c 100644 --- a/src/apps/marble-qt/CMakeLists.txt +++ b/src/apps/marble-qt/CMakeLists.txt @@ -1,61 +1,61 @@ set(marble_SRCS qtmain.cpp QtMainWindow.cpp) include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../marble-ui) if(MSVC) set(marble_SRCS ${marble_SRCS} marble.rc) endif(MSVC) qt_wrap_ui(marble_SRCS ${marble_UI}) if (WIN32) add_executable (marble-qt WIN32 ${marble_SRCS}) if (MSVC) set_target_properties(marble-qt PROPERTIES LINK_FLAGS "/ENTRY:\"mainCRTStartup\"") endif() else (WIN32) if (APPLE) add_executable (marble-qt ${marble_SRCS}) # For Mac OS X, the executable must be at the root of the bundle's executable folder INSTALL(TARGETS marble-qt RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/Marble.app/Contents/MacOS) else (APPLE) add_executable (marble-qt ${marble_SRCS}) endif (APPLE) endif (WIN32) target_link_libraries ( marble-qt Qt5::Widgets Qt5::PrintSupport Qt5::Network marbleui -${MARBLEWIDGET} +marblewidget astro) if(WIN32) target_link_libraries( marble-qt ws2_32 imm32 winmm ) endif(WIN32) ## this works for win32 only because FindQt does not handle this correct if(STATIC_BUILD) target_link_libraries(marble ${QT_PLUGINS_DIR}/imageformats/qjpeg.lib) target_link_libraries(marble ${QT_PLUGINS_DIR}/imageformats/qsvg.lib) endif(STATIC_BUILD) if(WIN32) install (TARGETS marble-qt RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}) else(WIN32) if (APPLE) # No need for this when installing to a bundle else (APPLE) install (TARGETS marble-qt RUNTIME DESTINATION bin ) endif (APPLE) endif(WIN32) if(APPS_INSTALL_DIR) install(PROGRAMS marble-qt.desktop DESTINATION ${APPS_INSTALL_DIR}) endif(APPS_INSTALL_DIR) diff --git a/src/apps/marble-ui/CMakeLists.txt b/src/apps/marble-ui/CMakeLists.txt index 6dbffab79..0026ed684 100644 --- a/src/apps/marble-ui/CMakeLists.txt +++ b/src/apps/marble-ui/CMakeLists.txt @@ -1,49 +1,49 @@ set(marble_SRCS ControlView.cpp MarbleTest.cpp) include_directories(${CMAKE_CURRENT_BINARY_DIR}) if(MSVC) set(marble_SRCS ${marble_SRCS} marble.qrc) endif(MSVC) qt_add_resources(marble_SRCS marble.qrc) qt_wrap_ui(marble_SRCS ${marble_UI}) add_library (marbleui STATIC ${marble_SRCS}) # TODO: use PUBLIC/PRIVATE everywhere instead of LINK_PUBLIC/LINK_PRIVATE # once SailfishOS has cmake >= 2.8.12 target_link_libraries ( marbleui LINK_PUBLIC - ${MARBLEWIDGET} + marblewidget Qt5::Widgets Qt5::PrintSupport LINK_PRIVATE Qt5::Network ) if (NOT MARBLE_NO_DBUS) target_link_libraries( marbleui LINK_PRIVATE Qt5::DBus ) endif () if(WIN32) # TODO: PUBLIC or can be PRIVATE? target_link_libraries( marbleui LINK_PUBLIC ws2_32 imm32 winmm ) endif(WIN32) ## this works for win32 only because FindQt does not handle this correct if(STATIC_BUILD) # TODO: PUBLIC or can be PRIVATE? target_link_libraries(marble LINK_PUBLIC ${QT_PLUGINS_DIR}/imageformats/qjpeg.lib) target_link_libraries(marble LINK_PUBLIC ${QT_PLUGINS_DIR}/imageformats/qsvg.lib) endif(STATIC_BUILD) diff --git a/src/bindings/python/CMakeLists.txt b/src/bindings/python/CMakeLists.txt index 8c1f29905..57683cbf4 100644 --- a/src/bindings/python/CMakeLists.txt +++ b/src/bindings/python/CMakeLists.txt @@ -1,25 +1,25 @@ project(pythonmarble) # compile SIP include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${SIP_INCLUDE_DIR} ${PYTHON_INCLUDE_PATH} # Qt ${QT_INCLUDE_DIR} ${QT_QT_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR} ${QT_QTNETWORK_INCLUDE_DIR} ${QT_QTSQL_INCLUDE_DIR} ${QT_QTXML_INCLUDE_DIR} ${QT_QTSVG_INCLUDE_DIR} ${QT_QTUITOOLS_INCLUDE_DIR} ${QT_QTWEBKIT_INCLUDE_DIR} # Marble included ../../../lib ) set(SIP_INCLUDES ${PYQT4_SIP_DIR} sip) set(SIP_CONCAT_PARTS 8) set(SIP_TAGS ALL WS_X11 ${PYQT4_VERSION_TAG} ) set(SIP_EXTRA_OPTIONS -g) 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} ${QT_QTWEBKIT_LIBRARY} ) diff --git a/src/lib/marble/CMakeLists.txt b/src/lib/marble/CMakeLists.txt index 850680a01..3d01823bb 100644 --- a/src/lib/marble/CMakeLists.txt +++ b/src/lib/marble/CMakeLists.txt @@ -1,652 +1,653 @@ PROJECT(marblewidget) macro_optional_find_package(Phonon) marble_set_package_properties( Phonon PROPERTIES DESCRIPTION "cross-platform multimedia framework that enables the use of audio and video content" ) marble_set_package_properties( Phonon PROPERTIES URL "http://qt.digia.com/" ) marble_set_package_properties( Phonon PROPERTIES TYPE OPTIONAL PURPOSE "Support for playback of soundcue elements" ) if(PHONON_FOUND) set(HAVE_PHONON TRUE) endif() CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config-phonon.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-phonon.h) INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/projections ${CMAKE_CURRENT_SOURCE_DIR}/routing ${CMAKE_CURRENT_SOURCE_DIR}/geodata ${CMAKE_CURRENT_SOURCE_DIR}/geodata/data ${CMAKE_CURRENT_SOURCE_DIR}/geodata/graphicsitem ${CMAKE_CURRENT_SOURCE_DIR}/geodata/scene ${CMAKE_CURRENT_SOURCE_DIR}/geodata/handlers ${CMAKE_CURRENT_SOURCE_DIR}/geodata/handlers/kml ${CMAKE_CURRENT_SOURCE_DIR}/geodata/handlers/dgml ${CMAKE_CURRENT_SOURCE_DIR}/geodata/parser ${CMAKE_CURRENT_SOURCE_DIR}/graphicsview ${CMAKE_CURRENT_SOURCE_DIR}/layers ${CMAKE_CURRENT_SOURCE_DIR}/osm ${CMAKE_CURRENT_SOURCE_DIR}/cloudsync ${CMAKE_SOURCE_DIR}/src/lib/astro ${ZLIB_INCLUDE_DIRS} ${PHONON_INCLUDES} ) INCLUDE(geodata/CMakeLists.txt) INCLUDE(graphicsview/CMakeLists.txt) INCLUDE(layers/CMakeLists.txt) INCLUDE(osm/CMakeLists.txt) set(MARBLE_LIB_VERSION "0.24.21") set(MARBLE_ABI_VERSION "25") ########### next target ############### if(MARBLE_NO_WEBKITWIDGETS) add_definitions(-DMARBLE_NO_WEBKITWIDGETS) endif() set(marblewidget_SRCS ${geodata_SRCS} ${graphicsview_SRCS} ${layers_SRCS} ${osm_SRCS} blendings/Blending.cpp blendings/BlendingAlgorithms.cpp blendings/BlendingFactory.cpp blendings/SunLightBlending.cpp DownloadRegion.cpp DownloadRegionDialog.cpp LatLonBoxWidget.cpp MarbleWidget.cpp MarbleAbstractPresenter.cpp MarbleModel.cpp MarbleMap.cpp MarbleColors.cpp MapViewWidget.cpp CelestialSortFilterProxyModel.cpp FileViewWidget.cpp TourWidget.cpp FlyToEditWidget.cpp TourControlEditWidget.cpp WaitEditWidget.cpp SoundCueEditWidget.cpp RemoveItemEditWidget.cpp TourItemDelegate.cpp MapViewItemDelegate.cpp TourPlayback.cpp LegendWidget.cpp PlaybackItem.cpp PlaybackAnimatedUpdateItem.cpp PlaybackFlyToItem.cpp PlaybackSoundCueItem.cpp PlaybackTourControlItem.cpp PlaybackWaitItem.cpp SerialTrack.cpp SoundTrack.cpp AnimatedUpdateTrack.cpp CurrentLocationWidget.cpp MarbleNavigator.cpp MarbleLegendBrowser.cpp MarbleAboutDialog.cpp MarbleInputHandler.cpp MarbleWidgetInputHandler.cpp MarbleWidgetPopupMenu.cpp MarblePlacemarkModel.cpp GeoDataTreeModel.cpp GeoUriParser.cpp kdescendantsproxymodel.cpp BranchFilterProxyModel.cpp TreeViewDecoratorModel.cpp MarbleDebug.cpp Tile.cpp TextureTile.cpp TileCoordsPyramid.cpp TileLevelRangeWidget.cpp TileLoader.cpp QtMarbleConfigDialog.cpp ClipPainter.cpp DownloadPolicy.cpp DownloadQueueSet.cpp GeoPainter.cpp HttpDownloadManager.cpp HttpJob.cpp RemoteIconLoader.cpp LayerManager.cpp PluginManager.cpp TimeControlWidget.cpp AbstractFloatItem.cpp PopupItem.cpp MarbleGlobal.cpp MarbleDirs.cpp MarbleLocale.cpp MarblePhysics.cpp DeferredFlag.cpp TileCreatorDialog.cpp MapThemeManager.cpp ViewportParams.cpp ViewParams.cpp projections/AbstractProjection.cpp projections/CylindricalProjection.cpp projections/AzimuthalProjection.cpp projections/SphericalProjection.cpp projections/EquirectProjection.cpp projections/MercatorProjection.cpp projections/GnomonicProjection.cpp projections/StereographicProjection.cpp projections/LambertAzimuthalProjection.cpp projections/AzimuthalEquidistantProjection.cpp projections/VerticalPerspectiveProjection.cpp VisiblePlacemark.cpp PlacemarkLayout.cpp Planet.cpp PlanetFactory.cpp Quaternion.cpp TextureColorizer.cpp TextureMapperInterface.cpp ScanlineTextureMapperContext.cpp SphericalScanlineTextureMapper.cpp EquirectScanlineTextureMapper.cpp MercatorScanlineTextureMapper.cpp TileScalingTextureMapper.cpp GenericScanlineTextureMapper.cpp VectorTileModel.cpp DiscCache.cpp ServerLayout.cpp StoragePolicy.cpp CacheStoragePolicy.cpp FileStoragePolicy.cpp FileStorageWatcher.cpp StackedTile.cpp TileId.cpp StackedTileLoader.cpp TileLoaderHelper.cpp TileCreator.cpp #jsonparser.cpp FileLoader.cpp FileManager.cpp PositionTracking.cpp DataMigration.cpp ImageF.cpp MovieCapture.cpp MovieCaptureDialog.cpp TourCaptureDialog.cpp EditPlacemarkDialog.cpp AddLinkDialog.cpp FormattedTextWidget.cpp AbstractDataPlugin.cpp AbstractDataPluginModel.cpp AbstractDataPluginItem.cpp AbstractWorkerThread.cpp PluginInterface.cpp DialogConfigurationInterface.cpp LayerInterface.cpp RenderState.cpp RenderPlugin.cpp RenderPluginInterface.cpp PositionProviderPlugin.cpp PositionProviderPluginInterface.cpp PlacemarkPositionProviderPlugin.cpp RouteSimulationPositionProviderPlugin.cpp MarblePluginSettingsWidget.cpp RenderPluginModel.cpp PluginAboutDialog.cpp PluginItemDelegate.cpp SunLocator.cpp MarbleClock.cpp SunControlWidget.cpp MergedLayerDecorator.cpp MathHelper.cpp LatLonEdit.cpp PlacemarkEditHeader.cpp MapThemeSortFilterProxyModel.cpp TemplateDocument.cpp routing/AlternativeRoutesModel.cpp routing/Maneuver.cpp routing/Route.cpp routing/RouteRequest.cpp routing/RouteSegment.cpp routing/RoutingModel.cpp routing/RoutingProfile.cpp routing/RoutingManager.cpp routing/RoutingLayer.cpp routing/RoutingInputWidget.cpp routing/RoutingWidget.cpp routing/RoutingProfilesWidget.cpp routing/RoutingProfilesModel.cpp routing/RoutingProfileSettingsDialog.cpp routing/SpeakersModel.cpp routing/VoiceNavigationModel.cpp routing/instructions/InstructionTransformation.cpp routing/instructions/RoutingInstruction.cpp routing/instructions/RoutingPoint.cpp routing/instructions/RoutingWaypoint.cpp routing/instructions/WaypointParser.cpp ParsingRunnerManager.cpp ReverseGeocodingRunnerManager.cpp RoutingRunnerManager.cpp SearchRunnerManager.cpp AutoNavigation.cpp SearchRunnerPlugin.cpp ReverseGeocodingRunnerPlugin.cpp RoutingRunnerPlugin.cpp ParseRunnerPlugin.cpp SearchRunner.cpp ReverseGeocodingRunner.cpp RoutingRunner.cpp ParsingRunner.cpp RunnerTask.cpp BookmarkManager.cpp EditBookmarkDialog.cpp BookmarkManagerDialog.cpp NewBookmarkFolderDialog.cpp PrintOptionsWidget.cpp ExternalEditorDialog.cpp GoToDialog.cpp MapWizard.cpp MapThemeDownloadDialog.cpp GeoGraphicsScene.cpp ElevationModel.cpp MarbleLineEdit.cpp SearchInputWidget.cpp SearchWidget.cpp kineticmodel.cpp NewstuffModel.cpp MarbleZip.cpp StyleBuilder.cpp cloudsync/CloudSyncManager.cpp cloudsync/RouteSyncManager.cpp cloudsync/OwncloudSyncBackend.cpp cloudsync/CloudRouteModel.cpp cloudsync/CloudRoutesDialog.cpp cloudsync/RouteItem.cpp cloudsync/RouteItemDelegate.cpp cloudsync/BookmarkSyncManager.cpp cloudsync/MergeItem.cpp cloudsync/ConflictDialog.cpp ) if (MARBLE_NO_WEBKITWIDGETS) LIST(APPEND marblewidget_SRCS NullMarbleWebView.cpp NullTinyWebBrowser.cpp ) else() LIST(APPEND marblewidget_SRCS MarbleWebView.cpp TinyWebBrowser.cpp ) endif() if (NOT MARBLE_NO_DBUS) LIST(APPEND marblewidget_SRCS MarbleDBusInterface.cpp ) endif() set (marblewidget_UI ${osm_UIS} LatLonBoxWidget.ui MapViewWidget.ui CurrentLocationWidget.ui FileViewWidget.ui TourWidget.ui MarbleNavigator.ui MarbleCacheSettingsWidget.ui MarbleViewSettingsWidget.ui MarbleNavigationSettingsWidget.ui TimeControlWidget.ui MarbleTimeSettingsWidget.ui MarblePluginSettingsWidget.ui TileCreatorDialog.ui TileLevelRangeWidget.ui MarbleAboutDialog.ui SunControlWidget.ui LatLonEdit.ui PlacemarkEditHeader.ui routing/RoutingWidget.ui DataMigrationWidget.ui EditBookmarkDialog.ui BookmarkManagerDialog.ui NewBookmarkFolderDialog.ui PrintOptions.ui ExternalEditor.ui GoToDialog.ui routing/RoutingSettingsWidget.ui routing/RoutingProfileSettingsDialog.ui MapWizard.ui MapThemeDownloadDialog.ui cloudsync/CloudRoutesDialog.ui MarbleCloudSyncSettingsWidget.ui MovieCaptureDialog.ui TourCaptureDialog.ui EditPlacemarkDialog.ui AddLinkDialog.ui FormattedTextWidget.ui ElevationWidget.ui ) if (MARBLE_NO_WEBKITWIDGETS) LIST(APPEND marblewidget_UI NullLegendWidget.ui NullWebPopupWidget.ui ) else() LIST(APPEND marblewidget_UI LegendWidget.ui WebPopupWidget.ui ) endif() # FIXME: cleaner approach of src/lib/marblwidget/MarbleControlBox.* vs. marble.qrc 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 Qt5::Widgets Qt5::Quick LINK_PRIVATE Qt5::Svg Qt5::Script Qt5::PrintSupport 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 "$" ) # 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() ########### install headers & cmake config files ############### if (WIN32 OR APPLE) # TODO: find how to install & deploy library, headers and config files as bundle for development return() endif() if (MARBLE_NO_WEBKITWIDGETS) set(marble_WebKit NullMarbleWebView.h NullTinyWebBrowser.h ) else() set(marble_WebKit MarbleWebView.h TinyWebBrowser.h ) endif() install( FILES ${CMAKE_CURRENT_BINARY_DIR}/marble_export.h ${graphicsview_HDRS} ${marble_WebKit} AutoNavigation.h BookmarkManager.h DownloadRegion.h DownloadRegionDialog.h LatLonBoxWidget.h MarbleWidget.h MarbleMap.h MarbleModel.h MapViewWidget.h CelestialSortFilterProxyModel.h LegendWidget.h FileViewWidget.h TourWidget.h FlyToEditWidget.h TourControlEditWidget.h WaitEditWidget.h SoundCueEditWidget.h RemoveItemEditWidget.h TourItemDelegate.h MapViewItemDelegate.h TourPlayback.h CurrentLocationWidget.h MarbleNavigator.h AbstractFloatItem.h MapThemeManager.h MarbleAboutDialog.h MarbleInputHandler.h MarbleWidgetInputHandler.h MarbleWidgetPopupMenu.h TileId.h TileCoordsPyramid.h TileLevelRangeWidget.h QtMarbleConfigDialog.h global.h MarbleColors.h MarbleGlobal.h MarbleLocale.h MarbleDebug.h MarbleDirs.h GeoPainter.h HttpDownloadManager.h TileCreatorDialog.h ViewportParams.h projections/AbstractProjection.h PositionTracking.h Quaternion.h SunLocator.h ClipPainter.h GeoGraphicsScene.h GeoDataTreeModel.h geodata/data/GeoDataAbstractView.h geodata/data/GeoDataAccuracy.h geodata/data/GeoDataBalloonStyle.h geodata/data/GeoDataColorStyle.h geodata/data/GeoDataContainer.h geodata/data/GeoDataCoordinates.h geodata/data/GeoDataDocument.h geodata/data/GeoDataFeature.h geodata/data/GeoDataFolder.h geodata/data/GeoDataGeometry.h geodata/data/GeoDataGroundOverlay.h geodata/data/GeoDataHotSpot.h geodata/data/GeoDataIconStyle.h geodata/data/GeoDataItemIcon.h geodata/data/GeoDataLabelStyle.h geodata/data/GeoDataLatLonAltBox.h geodata/data/GeoDataLatLonBox.h geodata/data/GeoDataLatLonQuad.h geodata/data/GeoDataLinearRing.h geodata/data/GeoDataLineString.h geodata/data/GeoDataLineStyle.h geodata/data/GeoDataListStyle.h geodata/data/GeoDataLod.h geodata/data/GeoDataLookAt.h geodata/data/GeoDataOverlay.h geodata/data/GeoDataMultiGeometry.h geodata/data/GeoDataObject.h geodata/data/GeoDataPlacemark.h geodata/data/GeoDataPoint.h geodata/data/GeoDataPolygon.h geodata/data/GeoDataPolyStyle.h geodata/data/GeoDataRegion.h geodata/data/GeoDataSnippet.h geodata/data/GeoDataStyle.h geodata/data/GeoDataStyleMap.h geodata/data/GeoDataStyleSelector.h geodata/data/GeoDataTrack.h geodata/data/GeoDataTimeSpan.h geodata/data/GeoDataTimeStamp.h geodata/data/GeoDataTimePrimitive.h geodata/data/Serializable.h geodata/geodata_export.h geodata/parser/GeoDocument.h geodata/writer/GeoWriter.h routing/RoutingWidget.h routing/RoutingManager.h TileCreator.h PluginManager.h PluginInterface.h DialogConfigurationInterface.h PositionProviderPlugin.h PositionProviderPluginInterface.h RenderPlugin.h RenderPluginInterface.h ParsingRunnerManager.h ReverseGeocodingRunnerManager.h RoutingRunnerManager.h SearchRunnerManager.h ParsingRunner.h SearchRunner.h ReverseGeocodingRunner.h RoutingRunner.h SearchRunnerPlugin.h ReverseGeocodingRunnerPlugin.h RoutingRunnerPlugin.h ParseRunnerPlugin.h LayerInterface.h RenderState.h PluginAboutDialog.h Planet.h PlanetFactory.h EditPlacemarkDialog.h AddLinkDialog.h FormattedTextWidget.h AbstractDataPlugin.h AbstractDataPluginModel.h AbstractDataPluginItem.h AbstractWorkerThread.h LatLonEdit.h PlacemarkEditHeader.h MapWizard.h MapThemeDownloadDialog.h ElevationModel.h routing/AlternativeRoutesModel.h routing/Route.h routing/Maneuver.h routing/RouteRequest.h routing/RouteSegment.h routing/RoutingManager.h routing/RoutingModel.h routing/RoutingProfile.h DESTINATION ${INCLUDE_INSTALL_DIR}/marble ) ########### CMake Config files ############### include(CMakePackageConfigHelpers) set(MARBLE_CMAKECONFIGNAME Marble) set(MARBLE_INSTALL_CMAKECONFIGDIR ${CMAKE_INSTALL_LIBDIR}/cmake/${MARBLE_CMAKECONFIGNAME}) configure_package_config_file(MarbleConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/${MARBLE_CMAKECONFIGNAME}Config.cmake INSTALL_DESTINATION ${MARBLE_INSTALL_CMAKECONFIGDIR} ) write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/${MARBLE_CMAKECONFIGNAME}ConfigVersion.cmake VERSION ${MARBLE_LIB_VERSION} COMPATIBILITY SameMajorVersion ) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${MARBLE_CMAKECONFIGNAME}Config.cmake ${CMAKE_CURRENT_BINARY_DIR}/${MARBLE_CMAKECONFIGNAME}ConfigVersion.cmake DESTINATION ${MARBLE_INSTALL_CMAKECONFIGDIR} ) install( EXPORT MarbleTargets FILE ${MARBLE_CMAKECONFIGNAME}Targets.cmake DESTINATION ${MARBLE_INSTALL_CMAKECONFIGDIR} ) diff --git a/src/lib/marble/declarative/CMakeLists.txt b/src/lib/marble/declarative/CMakeLists.txt index 1f68fd838..9d8b4a6cf 100644 --- a/src/lib/marble/declarative/CMakeLists.txt +++ b/src/lib/marble/declarative/CMakeLists.txt @@ -1,67 +1,67 @@ PROJECT( MarbleDeclarativePlugin ) macro_optional_find_package(Qt5Positioning) if(Qt5Positioning_FOUND) add_definitions(-DHAVE_QT5_POSITIONING) endif(Qt5Positioning_FOUND) INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ) add_library( marbledeclarative SHARED Bookmarks.cpp Coordinate.cpp DeclarativeDataPluginModel.cpp DeclarativeDataPlugin.cpp DeclarativeDataPluginItem.cpp DeclarativeMapThemeManager.cpp MapThemeModel.cpp MarbleDeclarativeObject.cpp MarbleDeclarativePlugin.cpp MarbleQuickItem.cpp Placemark.cpp PositionSource.cpp SearchBackend.cpp Tracking.cpp Routing.cpp Navigation.cpp OfflineDataModel.cpp RouteRequestModel.cpp Settings.cpp ) generate_export_header(marbledeclarative BASE_NAME marble_declarative) target_include_directories(marbledeclarative PUBLIC $) marble_add_project_resources(qmldir) # TODO: use PUBLIC/PRIVATE everywhere instead of LINK_PUBLIC/LINK_PRIVATE # once SailfishOS has cmake >= 2.8.12 target_link_libraries( marbledeclarative LINK_PUBLIC + marblewidget Qt5::Quick - ${MARBLEWIDGET} LINK_PRIVATE Qt5::Script ) if(Qt5Positioning_FOUND) target_link_libraries( marbledeclarative LINK_PRIVATE Qt5::Positioning ) endif() set_target_properties( marbledeclarative PROPERTIES INSTALL_RPATH_USE_LINK_PATH TRUE SKIP_BUILD_RPATH TRUE BUILD_WITH_INSTALL_RPATH TRUE ) if(WIN32) install(TARGETS marbledeclarative RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX} ARCHIVE DESTINATION lib) else() install(TARGETS marbledeclarative LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) endif() diff --git a/src/plasmarunner/CMakeLists.txt b/src/plasmarunner/CMakeLists.txt index f1dd8aa60..0abc3bbae 100644 --- a/src/plasmarunner/CMakeLists.txt +++ b/src/plasmarunner/CMakeLists.txt @@ -1,34 +1,34 @@ project(MarblePlasmaRunner) set(KDE_SKIP_UNINSTALL_TARGET ON CACHE BOOL "KDE uninstall target must be disabled") find_package(ECM QUIET) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH}) if(ECM_FOUND) include(ECMPoQmTools) include(KDEInstallDirs) include(KDECMakeSettings) endif() include(FeatureSummary) macro_optional_find_package(KF5 QUIET COMPONENTS Runner I18n) if (NOT KF5_FOUND) return() endif() set(plasmaRunner_SRCS main.cpp plasmarunner.cpp ) # we have to load the catalog ourselves currently 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 ) install(TARGETS plasma_runner_marble DESTINATION ${PLUGIN_INSTALL_DIR}) install(FILES plasma-runner-marble.desktop DESTINATION ${SERVICES_INSTALL_DIR}) diff --git a/src/plugins/designer/latloneditwidget/CMakeLists.txt b/src/plugins/designer/latloneditwidget/CMakeLists.txt index b1f943cbc..c6cd197e7 100644 --- a/src/plugins/designer/latloneditwidget/CMakeLists.txt +++ b/src/plugins/designer/latloneditwidget/CMakeLists.txt @@ -1,14 +1,12 @@ PROJECT( LatLonEditPlugin ) INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${Qt5UiPlugin_INCLUDE_DIRS} ${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 c776f1724..e36178981 100644 --- a/src/plugins/runner/gpx/CMakeLists.txt +++ b/src/plugins/runner/gpx/CMakeLists.txt @@ -1,63 +1,63 @@ PROJECT( GpxPlugin ) INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/handlers ${CMAKE_CURRENT_BINARY_DIR} ) set( gpx_handlers_SRCS handlers/GPXElementDictionary.cpp handlers/GPXgpxTagHandler.cpp handlers/GPXnameTagHandler.cpp handlers/GPXdescTagHandler.cpp handlers/GPXtypeTagHandler.cpp handlers/GPXtrkTagHandler.cpp handlers/GPXtrkptTagHandler.cpp handlers/GPXtrksegTagHandler.cpp handlers/GPXwptTagHandler.cpp handlers/GPXtimeTagHandler.cpp handlers/GPXeleTagHandler.cpp handlers/GPXextensionsTagHandler.cpp handlers/GPXTrackPointExtensionTagHandler.cpp handlers/GPXhrTagHandler.cpp handlers/GPXrteTagHandler.cpp handlers/GPXrteptTagHandler.cpp handlers/GPXcmtTagHandler.cpp handlers/GPXlinkTagHandler.cpp handlers/GPXurlTagHandler.cpp handlers/GPXurlnameTagHandler.cpp ) set( gpx_SRCS GpxParser.cpp GpxPlugin.cpp GpxRunner.cpp ) marble_add_plugin( GpxPlugin ${gpx_SRCS} ${gpx_handlers_SRCS} ) install(FILES marble_gpx.desktop DESTINATION ${APPS_INSTALL_DIR}) if( BUILD_MARBLE_TESTS ) include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/tests ) set( TestTrack_SRCS tests/TestTrack.cpp GpxParser.cpp ${gpx_handlers_SRCS} ) qt_generate_moc( tests/TestTrack.cpp ${CMAKE_CURRENT_BINARY_DIR}/TestTrack.moc ) set( TestTrack_SRCS TestTrack.moc ${TestTrack_SRCS} ) 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 ) endif( BUILD_MARBLE_TESTS ) set(KDE_SKIP_UNINSTALL_TARGET ON CACHE BOOL "KDE uninstall target must be disabled") find_package(ECM QUIET) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH}) if(ECM_FOUND) include(KDEInstallDirs) endif() macro_optional_find_package(KF5 QUIET COMPONENTS KIO) if(KF5_FOUND) # install again once part is fixed to load and show the passed file # install(FILES marble_part_gpx.desktop DESTINATION ${SERVICES_INSTALL_DIR}) install(FILES marble_thumbnail_gpx.desktop DESTINATION ${SERVICES_INSTALL_DIR}) endif() diff --git a/src/thumbnailer/CMakeLists.txt b/src/thumbnailer/CMakeLists.txt index d011cc5f7..be93e1ba5 100644 --- a/src/thumbnailer/CMakeLists.txt +++ b/src/thumbnailer/CMakeLists.txt @@ -1,24 +1,24 @@ project(MarbleThumbnailer) set(KDE_SKIP_UNINSTALL_TARGET ON CACHE BOOL "KDE uninstall target must be disabled") find_package(ECM QUIET) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH}) if(ECM_FOUND) include(KDEInstallDirs) endif() macro_optional_find_package(KF5 QUIET COMPONENTS KIO) if (NOT KF5_FOUND) return() endif() set(marblethumbnail_SRCS thumbnailer.cpp main.cpp ) 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 8832036fc..6a285e8ce 100644 --- a/tools/constellations2kml/CMakeLists.txt +++ b/tools/constellations2kml/CMakeLists.txt @@ -1,12 +1,12 @@ SET (TARGET constellations2kml) PROJECT (${TARGET}) include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ) 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 9ed68f68b..77ed18423 100644 --- a/tools/dateline/CMakeLists.txt +++ b/tools/dateline/CMakeLists.txt @@ -1,12 +1,12 @@ SET (TARGET dateline) PROJECT (${TARGET}) include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ) 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 fa5ccff3c..c835c8aa0 100644 --- a/tools/kml2cache/CMakeLists.txt +++ b/tools/kml2cache/CMakeLists.txt @@ -1,11 +1,11 @@ SET (TARGET kml2cache) PROJECT (${TARGET}) include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ) 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 582708775..1b0283e73 100644 --- a/tools/kml2kml/CMakeLists.txt +++ b/tools/kml2kml/CMakeLists.txt @@ -1,12 +1,12 @@ SET (TARGET kml2kml) PROJECT (${TARGET}) include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ) 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 97452049b..2c5d1a5ec 100644 --- a/tools/mapreproject/CMakeLists.txt +++ b/tools/mapreproject/CMakeLists.txt @@ -1,25 +1,25 @@ SET (TARGET mapreproject) PROJECT (${TARGET}) include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ) set( ${TARGET}_SRC IntegerInterpolation.cpp ReadOnlyMapDefinition.cpp OsmTileClusterRenderer.cpp NwwMapImage.cpp ReadOnlyMapImage.cpp BilinearInterpolation.cpp InterpolationMethod.cpp SimpleMapImage.cpp Thread.cpp NearestNeighborInterpolation.cpp NasaWorldWindToOpenStreetMapConverter.cpp 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 6013884f5..ab493bf87 100644 --- a/tools/maptheme-previewimage/CMakeLists.txt +++ b/tools/maptheme-previewimage/CMakeLists.txt @@ -1,13 +1,13 @@ SET (TARGET maptheme-previewimage) PROJECT (${TARGET}) include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ) 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 b4fc38339..ede9f2b46 100644 --- a/tools/mbtile-import/CMakeLists.txt +++ b/tools/mbtile-import/CMakeLists.txt @@ -1,12 +1,12 @@ SET (TARGET mbtile-import) PROJECT (${TARGET}) include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ) 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 0e88b7492..a558a1b99 100644 --- a/tools/osm-addresses/CMakeLists.txt +++ b/tools/osm-addresses/CMakeLists.txt @@ -1,31 +1,35 @@ SET (TARGET osm-addresses) PROJECT (${TARGET}) include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${PROTOBUF_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS} ../../src/plugins/runner/local-osm-search ) set( ${TARGET}_SRC OsmRegion.cpp OsmRegionTree.cpp OsmParser.cpp SqlWriter.cpp Writer.cpp main.cpp pbf/PbfParser.cpp xml/XmlParser.cpp ../../src/plugins/runner/local-osm-search/OsmPlacemark.cpp ../../src/plugins/runner/local-osm-search/DatabaseQuery.cpp ) PROTOBUF_GENERATE_CPP(PROTO_SRCS PROTO_HDRS pbf/fileformat.proto 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 916025855..fa6720145 100644 --- a/tools/osm-simplify/CMakeLists.txt +++ b/tools/osm-simplify/CMakeLists.txt @@ -1,41 +1,41 @@ cmake_minimum_required(VERSION 2.8.12) SET (TARGET osm-simplify) PROJECT (${TARGET}) if (POLICY CMP0063) cmake_policy(SET CMP0063 NEW) endif() find_package(Qt5Core REQUIRED) find_package(Qt5Widgets REQUIRED) find_package(Qt5Gui REQUIRED) include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ../../src/lib/marble/osm ../../src/lib/marble/geodata/writer ../../src/lib/marble/geodata/parser ../../src/lib/marble/geodata/data ../../src/lib/marble/geodata ../../src/lib/marble/ ) set( ${TARGET}_SRC main.cpp BaseClipper.cpp BaseFilter.cpp PlacemarkFilter.cpp ShpCoastlineProcessor.cpp LineStringProcessor.cpp TinyPlanetProcessor.cpp NodeReducer.cpp TagsFilter.cpp WayConcatenator.cpp 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 89ca955e1..cb8d13dd5 100644 --- a/tools/osm-sisyphus/CMakeLists.txt +++ b/tools/osm-sisyphus/CMakeLists.txt @@ -1,21 +1,21 @@ SET (TARGET osm-sisyphus) PROJECT (${TARGET}) include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ) set( ${TARGET}_SRC jobparameters.cpp jobmanager.cpp jobqueue.cpp logger.cpp job.cpp upload.cpp region.cpp 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 a77bbc5c9..6a5b3779d 100644 --- a/tools/poly2kml/CMakeLists.txt +++ b/tools/poly2kml/CMakeLists.txt @@ -1,12 +1,12 @@ SET (TARGET poly2kml) PROJECT (${TARGET}) include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ) 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 7e75894a7..8022b1813 100644 --- a/tools/shp2pn2/CMakeLists.txt +++ b/tools/shp2pn2/CMakeLists.txt @@ -1,12 +1,12 @@ SET (TARGET shp2pn2) PROJECT (${TARGET}) include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ) 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 0c0c6f9e9..dbbd3d986 100644 --- a/tools/tilecreator-srtm2/CMakeLists.txt +++ b/tools/tilecreator-srtm2/CMakeLists.txt @@ -1,17 +1,17 @@ SET (TARGET tilecreator-srtm2) PROJECT (${TARGET}) include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ) 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}) endif (APPLE) diff --git a/tools/tilecreator/CMakeLists.txt b/tools/tilecreator/CMakeLists.txt index 7d39b9ba6..61ca59a72 100644 --- a/tools/tilecreator/CMakeLists.txt +++ b/tools/tilecreator/CMakeLists.txt @@ -1,12 +1,12 @@ SET (TARGET tilecreator) PROJECT (${TARGET}) include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ) set( ${TARGET}_SRC main.cpp tccore.cpp ) add_executable( ${TARGET} ${${TARGET}_SRC} ) -target_link_libraries( ${TARGET} marblewidget-qt5 ) +target_link_libraries(${TARGET} marblewidget)