Skip to content

Commit 14fd7e1

Browse files
Totktonadartsisyk
authored andcommitted
Fix build against proj-6 (#13)
1 parent 4c1bf6e commit 14fd7e1

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

gis/CMakeLists.txt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ add_custom_command(OUTPUT proj4_cdef.lua
44
COMMAND echo 'typedef struct PJ *projPJ\;' >> proj4_cdef.tmp
55
COMMAND cat ${PROJ_INCLUDE_DIR}/proj_api.h |
66
sed '/\#include/d'|
7-
${CMAKE_C_COMPILER} -E - -P >> proj4_cdef.tmp
7+
${CMAKE_C_COMPILER} -E - -P -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H
8+
>> proj4_cdef.tmp
89
COMMAND cat ${CMAKE_CURRENT_SOURCE_DIR}/lib.h >> proj4_cdef.tmp
910
COMMAND echo ']]\)' >> proj4_cdef.tmp
1011
COMMAND ${CMAKE_COMMAND} -E rename proj4_cdef.tmp proj4_cdef.lua
@@ -16,7 +17,8 @@ add_custom_command(OUTPUT geos_cdef.lua
1617
COMMAND cat ${CMAKE_CURRENT_SOURCE_DIR}/lib.h >> geos_cdef.tmp
1718
COMMAND cat ${GEOS_INCLUDE_DIR}/geos_c.h |
1819
sed '/\#include/d'|
19-
${CMAKE_C_COMPILER} -E - -P -DGEOS_DLL="" -DGEOS_USE_ONLY_R_API=1 >> geos_cdef.tmp
20+
${CMAKE_C_COMPILER} -E - -P -DGEOS_DLL="" -DGEOS_USE_ONLY_R_API=1
21+
-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H >> geos_cdef.tmp
2022
COMMAND echo "\"]])\"" >> geos_cdef.tmp
2123
COMMAND ${CMAKE_COMMAND} -E rename geos_cdef.tmp geos_cdef.lua
2224
)
@@ -34,6 +36,7 @@ add_library(lib SHARED lib.c)
3436
target_link_libraries(lib ${GEOS_LIBRARY} ${PROJ_LIBRARY})
3537
set_target_properties(lib PROPERTIES PREFIX "" OUTPUT_NAME "lib")
3638
add_dependencies(lib generate_cdefs)
39+
add_definitions("-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H")
3740

3841
install(FILES init.lua DESTINATION ${TARANTOOL_INSTALL_LUADIR}/gis/)
3942
install(FILES projection.lua DESTINATION ${TARANTOOL_INSTALL_LUADIR}/gis/)

0 commit comments

Comments
 (0)