Skip to content

Fix build against proj-6 #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 17, 2019
Merged

Fix build against proj-6 #13

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions gis/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ add_custom_command(OUTPUT proj4_cdef.lua
COMMAND echo 'typedef struct PJ *projPJ\;' >> proj4_cdef.tmp
COMMAND cat ${PROJ_INCLUDE_DIR}/proj_api.h |
sed '/\#include/d'|
${CMAKE_C_COMPILER} -E - -P >> proj4_cdef.tmp
${CMAKE_C_COMPILER} -E - -P -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H
>> proj4_cdef.tmp
COMMAND cat ${CMAKE_CURRENT_SOURCE_DIR}/lib.h >> proj4_cdef.tmp
COMMAND echo ']]\)' >> proj4_cdef.tmp
COMMAND ${CMAKE_COMMAND} -E rename proj4_cdef.tmp proj4_cdef.lua
Expand All @@ -16,7 +17,8 @@ add_custom_command(OUTPUT geos_cdef.lua
COMMAND cat ${CMAKE_CURRENT_SOURCE_DIR}/lib.h >> geos_cdef.tmp
COMMAND cat ${GEOS_INCLUDE_DIR}/geos_c.h |
sed '/\#include/d'|
${CMAKE_C_COMPILER} -E - -P -DGEOS_DLL="" -DGEOS_USE_ONLY_R_API=1 >> geos_cdef.tmp
${CMAKE_C_COMPILER} -E - -P -DGEOS_DLL="" -DGEOS_USE_ONLY_R_API=1
-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H >> geos_cdef.tmp
COMMAND echo "\"]])\"" >> geos_cdef.tmp
COMMAND ${CMAKE_COMMAND} -E rename geos_cdef.tmp geos_cdef.lua
)
Expand All @@ -34,6 +36,7 @@ add_library(lib SHARED lib.c)
target_link_libraries(lib ${GEOS_LIBRARY} ${PROJ_LIBRARY})
set_target_properties(lib PROPERTIES PREFIX "" OUTPUT_NAME "lib")
add_dependencies(lib generate_cdefs)
add_definitions("-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H")

install(FILES init.lua DESTINATION ${TARANTOOL_INSTALL_LUADIR}/gis/)
install(FILES projection.lua DESTINATION ${TARANTOOL_INSTALL_LUADIR}/gis/)
Expand Down