Merge pull request #1235 from joto/fix-no-lua-build

Fix build without Lua and test it on travis

Author: lonvia

.travis.yml

@@ -96,6 +96,17 @@ matrix:
            CC=gcc-8 CXX=g++-8 CPPVERSION=11
 
 
+    - os: linux
+      dist: bionic
+      compiler: gcc-8
+      env: T="bionic_gcc8_pg10_no_lua"
+           PG_VERSIONS=10
+           POSTGIS_VERSION=2.4
+           BUILD_TYPE="Debug"
+           CXXFLAGS="-pedantic -Wextra -Werror"
+           CC=gcc-8 CXX=g++-8 CPPVERSION=11
+
+
     - os: linux
       dist: focal
       compiler: gcc-9
@@ -121,7 +132,8 @@ before_install:
       export POSTGIS_PKG="$POSTGIS_PKG $PPG $PPG-scripts";
     done
   - echo $POSTGIS_PKG
-  - sudo -E apt-get install -yq --no-install-suggests --no-install-recommends $CC $POSTGIS_PKG liblua$LUA_VERSION-dev lua$LUA_VERSION
+  - sudo -E apt-get install -yq --no-install-suggests --no-install-recommends $CC $POSTGIS_PKG
+  - if [ -n "${LUA_VERSION}" ]; then sudo -E apt-get install -yq --no-install-suggests --no-install-recommends liblua$LUA_VERSION-dev lua$LUA_VERSION; fi
   # g++ needs extra install, clang doesn't, so ignore errors here
   - sudo -E apt-get install -yq --no-install-suggests --no-install-recommends $CXX || true
 
@@ -132,7 +144,8 @@ before_script:
 
 script:
   - mkdir build && cd build
-  - cmake .. -LA -DBUILD_TESTS=ON -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DCMAKE_CXX_STANDARD=${CPPVERSION} -DWITH_LUAJIT=${LUAJIT_OPTION}
+  - if [ -z "${LUA_VERSION}" ]; then LUA_OPTIONS="-DWITH_LUA=OFF"; else LUA_OPTIONS="-DWITH_LUA=ON -DWITH_LUAJIT=${LUAJIT_OPTION}"; fi
+  - cmake .. -LA -DBUILD_TESTS=ON -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DCMAKE_CXX_STANDARD=${CPPVERSION} ${LUA_OPTIONS}
   - make -j2
   - echo "Running tests ... "
   - if [[ $TEST_NODB ]]; then

src/CMakeLists.txt

@@ -5,7 +5,6 @@ set(osm2pgsql_lib_SOURCES
   expire-tiles.cpp
   gazetteer-style.cpp
   geometry-processor.cpp
-  geom-transform.cpp
   id-tracker.cpp
   input-handler.cpp
   middle-pgsql.cpp
@@ -38,7 +37,6 @@ set(osm2pgsql_lib_SOURCES
   expire-tiles.hpp
   gazetteer-style.hpp
   geometry-processor.hpp
-  geom-transform.hpp
   id-tracker.hpp
   input-handler.hpp
   middle-pgsql.hpp
@@ -80,6 +78,7 @@ if (LUA_FOUND OR LUAJIT_FOUND)
     list(APPEND osm2pgsql_lib_SOURCES
         flex-table.cpp
         flex-table-column.cpp
+        geom-transform.cpp
         lua-utils.cpp
         output-flex.cpp
         tagtransform-lua.cpp

src/geom-transform.hpp

@@ -2,11 +2,15 @@
 #define OSM2PGSQL_GEOM_TRANSFORM_HPP
 
 #include "flex-table-column.hpp"
-#include "lua.hpp"
 #include "osmium-builder.hpp"
 
 #include <osmium/fwd.hpp>
 
+extern "C"
+{
+#include <lua.h>
+}
+
 #include <memory>
 
 /**

tests/CMakeLists.txt

@@ -118,11 +118,13 @@ else()
     message(WARNING "Can not find python, regression test disabled")
 endif()
 
-if(LUA_EXE)
-    message(STATUS "Added test: lua-lib")
-    add_test(NAME lua-lib COMMAND ${LUA_EXE} lua/tests.lua
-             WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
-    set_tests_properties(lua-lib PROPERTIES LABELS NoDB)
-else()
-    message(WARNING "Can not find Lua interpreter, test 'lua-lib' disabled")
+if (HAVE_LUA)
+    if (LUA_EXE)
+        message(STATUS "Added test: lua-lib")
+        add_test(NAME lua-lib COMMAND ${LUA_EXE} lua/tests.lua
+                WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+        set_tests_properties(lua-lib PROPERTIES LABELS NoDB)
+    else()
+        message(WARNING "Can not find Lua interpreter, test 'lua-lib' disabled")
+    endif()
 endif()