✨ It works on Windows, using CMake

GitiFarazPishro · Jul 23, 2019 · 3ddbe7b · 3ddbe7b
1 parent c53483c
commit 3ddbe7b
Show file tree

Hide file tree

Showing 16 changed files with 285 additions and 151 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
diff --git a/demo/c++/CMakeLists.txt b/demo/c++/CMakeLists.txt
@@ -1,3 +1,5 @@
 add_executable(mapnik-demo rundemo.cpp)
 add_dependencies(mapnik-demo mapnik)
 target_link_libraries(mapnik-demo PRIVATE mapnik)
+target_compile_definitions(mapnik-demo PRIVATE ${IMGFORMAT_DEFS})
+install(TARGETS mapnik-demo DESTINATION bin)
diff --git a/demo/viewer/CMakeLists.txt b/demo/viewer/CMakeLists.txt
@@ -8,7 +8,21 @@ add_executable(mapnik-viewer
     main.cpp
     mainwindow.cpp
     mapwidget.cpp
-    styles_model.cpp)
+    styles_model.cpp
+
+    forms/about.ui
+    forms/info.ui
+    forms/layer_info.ui    
+
+    mapnik_viewer.qrc)
 
+set_target_properties(mapnik-viewer PROPERTIES
+    AUTOUIC_SEARCH_PATHS forms
+    AUTORCC ON    
+    AUTOUIC ON
+    AUTOMOC ON)
+
 add_dependencies(mapnik-viewer mapnik)
-target_link_libraries(mapnik-viewer PRIVATE mapnik)
+target_link_libraries(mapnik-viewer PRIVATE mapnik Qt5::Widgets)
+target_compile_definitions(mapnik-viewer PRIVATE ${IMGFORMAT_DEFS})
+install(TARGETS mapnik-viewer DESTINATION bin)
diff --git a/dependencies.cmake b/dependencies.cmake
diff --git a/files.cmake b/files.cmake
@@ -122,6 +122,53 @@ set (MAPNIK_SOURCES
     src/wkb.cpp
     src/xml_tree.cpp
     )
+
+
+set(MAPNIK_AGG_SOURCES
+    src/agg/agg_renderer.cpp
+    src/agg/process_building_symbolizer.cpp
+    src/agg/process_debug_symbolizer.cpp
+    src/agg/process_dot_symbolizer.cpp
+    src/agg/process_group_symbolizer.cpp
+    src/agg/process_line_pattern_symbolizer.cpp
+    src/agg/process_line_symbolizer.cpp
+    src/agg/process_markers_symbolizer.cpp
+    src/agg/process_point_symbolizer.cpp
+    src/agg/process_polygon_pattern_symbolizer.cpp
+    src/agg/process_polygon_symbolizer.cpp
+    src/agg/process_raster_symbolizer.cpp
+    src/agg/process_shield_symbolizer.cpp
+    src/agg/process_text_symbolizer.cpp)
+
+
+set(AGG_SOURCES
+    deps/agg/src/agg_arc.cpp
+    deps/agg/src/agg_arrowhead.cpp
+    deps/agg/src/agg_bezier_arc.cpp
+    deps/agg/src/agg_bspline.cpp
+    deps/agg/src/agg_curves.cpp
+    deps/agg/src/agg_embedded_raster_fonts.cpp
+    deps/agg/src/agg_gsv_text.cpp
+    deps/agg/src/agg_image_filters.cpp
+    deps/agg/src/agg_line_aa_basics.cpp
+    deps/agg/src/agg_line_profile_aa.cpp
+    deps/agg/src/agg_pixfmt_rgba.cpp
+    deps/agg/src/agg_rounded_rect.cpp
+    deps/agg/src/agg_sqrt_tables.cpp
+    deps/agg/src/agg_trans_affine.cpp
+    deps/agg/src/agg_trans_double_path.cpp
+    deps/agg/src/agg_trans_single_path.cpp
+    deps/agg/src/agg_trans_warp_magnifier.cpp
+    deps/agg/src/agg_vcgen_bspline.cpp
+    deps/agg/src/agg_vcgen_contour.cpp
+    deps/agg/src/agg_vcgen_dash.cpp
+    deps/agg/src/agg_vcgen_markers_term.cpp
+    deps/agg/src/agg_vcgen_stroke.cpp
+    deps/agg/src/agg_vpgen_clip_polygon.cpp
+    deps/agg/src/agg_vpgen_clip_polyline.cpp
+    deps/agg/src/agg_vpgen_segmentator.cpp )    
+
+
 set(MAPNIK_INC
     mapnik/adaptive_smooth.hpp
     mapnik/agg_helpers.hpp

diff --git a/plugins/input/csv/CMakeLists.txt b/plugins/input/csv/CMakeLists.txt
@@ -9,3 +9,4 @@ target_link_libraries(mapnik-input-csv PUBLIC mapnik mapnik-wkt  mapnik-json)
 set_target_properties(mapnik-input-csv PROPERTIES PREFIX "")
 set_target_properties(mapnik-input-csv PROPERTIES OUTPUT_NAME "csv")
 set_target_properties(mapnik-input-csv PROPERTIES SUFFIX ".input")
+install(TARGETS mapnik-input-csv DESTINATION bin/plugins/input)
diff --git a/plugins/input/gdal/CMakeLists.txt b/plugins/input/gdal/CMakeLists.txt
@@ -6,3 +6,4 @@ target_link_libraries(mapnik-input-gdal PUBLIC mapnik ${GDAL_LIBRARIES})
 set_target_properties(mapnik-input-gdal PROPERTIES PREFIX "")
 set_target_properties(mapnik-input-gdal PROPERTIES OUTPUT_NAME "gdal")
 set_target_properties(mapnik-input-gdal PROPERTIES SUFFIX ".input")
+install(TARGETS mapnik-input-gdal DESTINATION bin/plugins/input)
diff --git a/plugins/input/geobuf/CMakeLists.txt b/plugins/input/geobuf/CMakeLists.txt
@@ -6,3 +6,4 @@ target_link_libraries(mapnik-input-geobuf PUBLIC mapnik)
 set_target_properties(mapnik-input-geobuf PROPERTIES PREFIX "")
 set_target_properties(mapnik-input-geobuf PROPERTIES OUTPUT_NAME "geobuf")
 set_target_properties(mapnik-input-geobuf PROPERTIES SUFFIX ".input")
+install(TARGETS mapnik-input-geobuf DESTINATION bin/plugins/input)
diff --git a/plugins/input/geojson/CMakeLists.txt b/plugins/input/geojson/CMakeLists.txt
@@ -8,3 +8,4 @@ target_link_libraries(mapnik-input-geojson PUBLIC mapnik mapnik-json)
 set_target_properties(mapnik-input-geojson PROPERTIES PREFIX "")
 set_target_properties(mapnik-input-geojson PROPERTIES OUTPUT_NAME "geojson")
 set_target_properties(mapnik-input-geojson PROPERTIES SUFFIX ".input")
+install(TARGETS mapnik-input-geojson DESTINATION bin/plugins/input)
diff --git a/plugins/input/ogr/CMakeLists.txt b/plugins/input/ogr/CMakeLists.txt
@@ -8,3 +8,4 @@ target_link_libraries(mapnik-input-ogr PUBLIC mapnik ${OGR_LIBRARIES} ${GDAL_LIB
 set_target_properties(mapnik-input-ogr PROPERTIES PREFIX "")
 set_target_properties(mapnik-input-ogr PROPERTIES OUTPUT_NAME "ogr")
 set_target_properties(mapnik-input-ogr PROPERTIES SUFFIX ".input")
+install(TARGETS mapnik-input-ogr DESTINATION bin/plugins/input)
diff --git a/plugins/input/pgraster/CMakeLists.txt b/plugins/input/pgraster/CMakeLists.txt
@@ -7,3 +7,4 @@ target_link_libraries(mapnik-input-pgraster PUBLIC mapnik  ${PostgreSQL_LIBRARIE
 set_target_properties(mapnik-input-pgraster PROPERTIES PREFIX "")
 set_target_properties(mapnik-input-pgraster PROPERTIES OUTPUT_NAME "pgraster")
 set_target_properties(mapnik-input-pgraster PROPERTIES SUFFIX ".input")
+install(TARGETS mapnik-input-pgraster DESTINATION bin/plugins/input)
diff --git a/plugins/input/postgis/CMakeLists.txt b/plugins/input/postgis/CMakeLists.txt
@@ -6,3 +6,4 @@ target_link_libraries(mapnik-input-postgis PUBLIC mapnik ${PostgreSQL_LIBRARIES}
 set_target_properties(mapnik-input-postgis PROPERTIES PREFIX "")
 set_target_properties(mapnik-input-postgis PROPERTIES OUTPUT_NAME "postgis")
 set_target_properties(mapnik-input-postgis PROPERTIES SUFFIX ".input")
+install(TARGETS mapnik-input-postgis DESTINATION bin/plugins/input)
diff --git a/plugins/input/raster/CMakeLists.txt b/plugins/input/raster/CMakeLists.txt
@@ -7,3 +7,4 @@ target_link_libraries(mapnik-input-raster PUBLIC mapnik)
 set_target_properties(mapnik-input-raster PROPERTIES PREFIX "")
 set_target_properties(mapnik-input-raster PROPERTIES OUTPUT_NAME "raster")
 set_target_properties(mapnik-input-raster PROPERTIES SUFFIX ".input")
+install(TARGETS mapnik-input-raster DESTINATION bin/plugins/input)
diff --git a/plugins/input/shape/CMakeLists.txt b/plugins/input/shape/CMakeLists.txt
@@ -6,3 +6,4 @@ target_link_libraries(mapnik-input-shape PUBLIC mapnik)
 set_target_properties(mapnik-input-shape PROPERTIES PREFIX "")
 set_target_properties(mapnik-input-shape PROPERTIES OUTPUT_NAME "shape")
 set_target_properties(mapnik-input-shape PROPERTIES SUFFIX ".input")
+install(TARGETS mapnik-input-shape DESTINATION bin/plugins/input)
diff --git a/plugins/input/sqlite/CMakeLists.txt b/plugins/input/sqlite/CMakeLists.txt
@@ -2,7 +2,8 @@ add_library(mapnik-input-sqlite SHARED
     sqlite_datasource.cpp
     sqlite_featureset.cpp)
 
-target_link_libraries(mapnik-input-sqlite PUBLIC mapnik mapnik-wkt)
+target_link_libraries(mapnik-input-sqlite PUBLIC mapnik SQLite::SQLite3)
 set_target_properties(mapnik-input-sqlite PROPERTIES PREFIX "")
 set_target_properties(mapnik-input-sqlite PROPERTIES OUTPUT_NAME "sqlite")
 set_target_properties(mapnik-input-sqlite PROPERTIES SUFFIX ".input")
+install(TARGETS mapnik-input-sqlite DESTINATION bin/plugins/input)
diff --git a/plugins/input/topojson/CMakeLists.txt b/plugins/input/topojson/CMakeLists.txt
@@ -6,3 +6,4 @@ target_link_libraries(mapnik-input-topojson PUBLIC mapnik mapnik-json)
 set_target_properties(mapnik-input-topojson PROPERTIES PREFIX "")
 set_target_properties(mapnik-input-topojson PROPERTIES OUTPUT_NAME "topojson")
 set_target_properties(mapnik-input-topojson PROPERTIES SUFFIX ".input")
+install(TARGETS mapnik-input-topojson DESTINATION bin/plugins/input)