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

wip

Browse source
This commit is contained in:
Mathis Logemann 2022-08-16 21:03:56 +02:00
parent 34df24f4e2
commit 54b0381f4d
5 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -16,6 +16,7 @@ message(STATUS "mapnik version: ${PROJECT_VERSION}")
# https://cliutils.gitlab.io/modern-cmake/chapters/features/ides.html
set_property(GLOBAL PROPERTY USE_FOLDERS ON)
set(CMAKE_FIND_PACKAGE_TARGETS_GLOBAL ON) # with newer cmake versions put all find_package in global scope
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
include(FeatureSummary)
include(MapnikOption)
@ -132,6 +133,7 @@ set(MAPNIK_OPTIONAL_LIBS_INCLUDE "")
# Begin project configuration
# needs to be before the first call of find_boost.
list(APPEND MAPNIK_COMPILE_DEFS BOOST_SPIRIT_X3_HIDE_CXX17_WARNING)
if(USE_MULTITHREADED)
set(Boost_USE_MULTITHREADED ON)
list(APPEND MAPNIK_COMPILE_DEFS MAPNIK_THREADSAFE)

2
plugins/input/pgraster/CMakeLists.txt
View file

@ -1,4 +1,4 @@
find_package(PostgreSQL REQUIRED)
mapnik_find_package(PostgreSQL REQUIRED)
add_plugin_target(input-pgraster "pgraster")
target_sources(input-pgraster ${_plugin_visibility}

2
plugins/input/postgis/CMakeLists.txt
View file

@ -1,4 +1,4 @@
find_package(PostgreSQL REQUIRED)
mapnik_find_package(PostgreSQL REQUIRED)
add_plugin_target(input-postgis "postgis")
target_sources(input-postgis ${_plugin_visibility}

5
test/CMakeLists.txt
View file

@ -1,5 +1,5 @@
find_package(Boost ${BOOST_MIN_VERSION} REQUIRED COMPONENTS program_options)
find_package(PostgreSQL REQUIRED)
mapnik_find_package(Boost ${BOOST_MIN_VERSION} REQUIRED COMPONENTS program_options)
mapnik_find_package(PostgreSQL REQUIRED)
include(FetchContent)
@ -163,7 +163,6 @@ target_link_libraries(font_registration_test PUBLIC
)
target_include_directories(font_registration_test PRIVATE "${Catch2_SOURCE_DIR}/single_include/catch2" "${CMAKE_CURRENT_BINARY_DIR}")
#not workable since boost::filesystem native returns a wstring and the function taskes a std::string
add_executable(map_xml_test standalone/map_xml_test.cpp)
set_target_properties(map_xml_test PROPERTIES
LIBRARY_OUTPUT_DIRECTORY "${MAPNIK_OUTPUT_DIR}"

6
utils/pgsql2sqlite/CMakeLists.txt
View file

@ -1,6 +1,6 @@
find_package(Boost ${BOOST_MIN_VERSION} REQUIRED COMPONENTS program_options)
find_package(SQLite3 REQUIRED)
find_package(PostgreSQL REQUIRED)
mapnik_find_package(Boost ${BOOST_MIN_VERSION} REQUIRED COMPONENTS program_options)
mapnik_find_package(SQLite3 REQUIRED)
mapnik_find_package(PostgreSQL REQUIRED)
add_executable(pgsql2sqlite
main.cpp