sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

enable qt6 or qt5 for mapnik-viewer. android could be dropped

Browse source
This commit is contained in:
Mathis Logemann 2021-07-23 17:06:24 +02:00
parent f90c684471
commit ac6842656e
1 changed files with 27 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
demo/viewer/CMakeLists.txt
View file

@ -1,8 +1,9 @@
project(mapnik-viewer) project(mapnik-viewer)
find_package(Qt5 COMPONENTS Widgets REQUIRED) find_package(QT NAMES Qt6 Qt5 COMPONENTS Widgets REQUIRED)
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Widgets REQUIRED)
add_executable(mapnik-viewer set(PROJECT_SOURCES
about_dialog.cpp about_dialog.cpp
info_dialog.cpp info_dialog.cpp
layerdelegate.cpp layerdelegate.cpp
@ -19,6 +20,23 @@ add_executable(mapnik-viewer
mapnik_viewer.qrc mapnik_viewer.qrc
) )
if(${QT_VERSION_MAJOR} GREATER_EQUAL 6)
qt_add_executable(mapnik-viewer
MANUAL_FINALIZATION
${PROJECT_SOURCES}
)
else()
if(ANDROID)
add_library(mapnik-viewer SHARED
${PROJECT_SOURCES}
)
else()
add_executable(mapnik-viewer
${PROJECT_SOURCES}
)
endif()
endif()
set_target_properties(mapnik-viewer PROPERTIES set_target_properties(mapnik-viewer PROPERTIES
AUTOUIC_SEARCH_PATHS forms AUTOUIC_SEARCH_PATHS forms
AUTORCC ON AUTORCC ON
@ -26,18 +44,23 @@ set_target_properties(mapnik-viewer PROPERTIES
AUTOMOC ON AUTOMOC ON
) )
target_link_libraries(mapnik-viewer PRIVATE target_link_libraries(mapnik-viewer PRIVATE
Qt5::Widgets Qt${QT_VERSION_MAJOR}::Widgets
mapnik::core mapnik::core
mapnik::agg mapnik::agg
mapnik::mapnik mapnik::mapnik
) )
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/viewer.ini file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/viewer.ini
"[mapnik] "[mapnik]
plugins_dir=${PLUGINS_INSTALL_DIR} plugins_dir=${PLUGINS_INSTALL_DIR}
fonts/1/dir=${FONTS_INSTALL_DIR}" fonts/1/dir=${FONTS_INSTALL_DIR}"
) )
if(QT_VERSION_MAJOR EQUAL 6)
qt_finalize_executable(mapnik-viewer)
endif()
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/viewer.ini DESTINATION bin) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/viewer.ini DESTINATION bin)
mapnik_install(TARGET mapnik-viewer) mapnik_install(TARGET mapnik-viewer)