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

try with c++14

Browse source
This commit is contained in:
Mathis Logemann 2020-11-21 15:34:13 +01:00
parent 0084628d61
commit 096befe69e
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -45,7 +45,7 @@ option(BUILD_UTILITY_PGSQL2SQLITE "builds the utility program pgsql2sqlite" ON)
option(BUILD_UTILITY_SHAPEINDEX "builds the utility program shapeindex" ON) option(BUILD_UTILITY_SHAPEINDEX "builds the utility program shapeindex" ON)
option(BUILD_UTILITY_SVG2PNG "builds the utility program svg2png" ON) option(BUILD_UTILITY_SVG2PNG "builds the utility program svg2png" ON)
set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD 14)
find_package(Boost 1.74 REQUIRED COMPONENTS filesystem system regex program_options) find_package(Boost 1.74 REQUIRED COMPONENTS filesystem system regex program_options)
find_package(ICU REQUIRED COMPONENTS uc) find_package(ICU REQUIRED COMPONENTS uc)

6
src/CMakeLists.txt
View file

@ -278,8 +278,12 @@ endif()
add_library(mapnik ${COMPILE_SRC}) add_library(mapnik ${COMPILE_SRC})
add_library(mapnik::mapnik ALIAS mapnik) add_library(mapnik::mapnik ALIAS mapnik)
set(COMPILE_DEFS "")
if(BUILD_SHARED_LIBS)
list(APPEND COMPILE_DEFS MAPNIK_EXPORTS)
endif()
target_compile_definitions(mapnik PRIVATE MAPNIK_EXPORTS) target_compile_definitions(mapnik PRIVATE ${COMPILE_DEFS})
target_link_libraries(mapnik PRIVATE target_link_libraries(mapnik PRIVATE
mapnik::headers mapnik::headers
mapnik::agg mapnik::agg