@@ -4,7 +4,8 @@ add_custom_command(OUTPUT proj4_cdef.lua
4
4
COMMAND echo 'typedef struct PJ *projPJ\; ' >> proj4_cdef.tmp
5
5
COMMAND cat ${PROJ_INCLUDE_DIR} /proj_api.h |
6
6
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
8
9
COMMAND cat ${CMAKE_CURRENT_SOURCE_DIR} /lib.h >> proj4_cdef.tmp
9
10
COMMAND echo ']]\) ' >> proj4_cdef.tmp
10
11
COMMAND ${CMAKE_COMMAND} -E rename proj4_cdef.tmp proj4_cdef.lua
@@ -16,7 +17,8 @@ add_custom_command(OUTPUT geos_cdef.lua
16
17
COMMAND cat ${CMAKE_CURRENT_SOURCE_DIR} /lib.h >> geos_cdef.tmp
17
18
COMMAND cat ${GEOS_INCLUDE_DIR} /geos_c.h |
18
19
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
20
22
COMMAND echo "\" ]])\" " >> geos_cdef.tmp
21
23
COMMAND ${CMAKE_COMMAND} -E rename geos_cdef.tmp geos_cdef.lua
22
24
)
@@ -34,6 +36,7 @@ add_library(lib SHARED lib.c)
34
36
target_link_libraries (lib ${GEOS_LIBRARY} ${PROJ_LIBRARY} )
35
37
set_target_properties (lib PROPERTIES PREFIX "" OUTPUT_NAME "lib" )
36
38
add_dependencies (lib generate_cdefs )
39
+ add_definitions ("-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H" )
37
40
38
41
install (FILES init.lua DESTINATION ${TARANTOOL_INSTALL_LUADIR} /gis/ )
39
42
install (FILES projection.lua DESTINATION ${TARANTOOL_INSTALL_LUADIR} /gis/ )
0 commit comments