Merge pull request #9476 from rouault/android_no_warning

CI: Android: enable -Werror
OSGeo · Mar 17, 2024 · 9b4f360 · 9b4f360
2 parents 49b95c1 + 92d075a
commit 9b4f360
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/.github/workflows/android_cmake/start.sh b/.github/workflows/android_cmake/start.sh
@@ -79,6 +79,8 @@ PKG_CONFIG_LIBDIR=/tmp/install/lib/pkgconfig cmake .. \
  -DCMAKE_ANDROID_NDK=$ANDROID_NDK \
  -DCMAKE_ANDROID_ARCH_ABI=arm64-v8a \
  -DCMAKE_SYSTEM_VERSION=24 \
+ -DCMAKE_C_FLAGS=-Werror \
+ -DCMAKE_CXX_FLAGS=-Werror \
  "-DCMAKE_PREFIX_PATH=/tmp/install;$NDK_TOOLCHAIN/sysroot/usr/" \
  -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=NEVER \
  -DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=NEVER \

diff --git a/ogr/ogrlinestring.cpp b/ogr/ogrlinestring.cpp
@@ -2050,6 +2050,7 @@ double OGRSimpleCurve::Project(const OGRPoint *poPoint) const
 {
     double dfResult = -1;
 #ifndef HAVE_GEOS
+    CPL_IGNORE_RET_VAL(poPoint);
     CPLError(CE_Failure, CPLE_NotSupported, "GEOS support not enabled.");
     return dfResult;
 #else

diff --git a/ogr/ogrsf_frmts/jml/ogrjmllayer.cpp b/ogr/ogrsf_frmts/jml/ogrjmllayer.cpp
@@ -29,10 +29,10 @@
 #include "ogr_jml.h"
 #include "ogr_p.h"
 
-constexpr int PARSER_BUF_SIZE = 8192;
-
 #ifdef HAVE_EXPAT
 
+constexpr int PARSER_BUF_SIZE = 8192;
+
 /************************************************************************/
 /*                              OGRJMLLayer()                           */
 /************************************************************************/