[geos-commits] [SCM] GEOS branch main updated. 03c0de4028cbf8de378e25dd3cc4be1c9bc1e5bb
git at osgeo.org
git at osgeo.org
Tue Oct 12 12:38:56 PDT 2021
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GEOS".
The branch, main has been updated
via 03c0de4028cbf8de378e25dd3cc4be1c9bc1e5bb (commit)
from cdadf34b12c580c0a2d143b956a53a0eba648c73 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 03c0de4028cbf8de378e25dd3cc4be1c9bc1e5bb
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date: Tue Oct 12 12:38:25 2021 -0700
Fix build with inlines set off and add option to disable inline to CI recipe.
TODO: just make inline default and remove this option?
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6257608..56ea589 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -43,12 +43,22 @@ jobs:
os: ubuntu-18.04
}
- {
- compiler: g++,
- build_type: Debug,
+ compiler: clang++,
+ build_type: Release,
+ cxxstd: 11,
+ arch: 64,
+ packages: 'clang',
+ cmake: 3.10.*,
+ os: ubuntu-18.04
+ }
+ - {
+ compiler: clang++,
+ build_type: Release,
cxxstd: 11,
arch: 64,
packages: 'g++',
cmake: 3.15.*,
+ cmake_extra: '-DDISABLE_GEOS_INLINE=ON',
os: ubuntu-20.04
}
- {
@@ -94,7 +104,7 @@ jobs:
mkdir build.cmake
cd build.cmake
cmake --version
- cmake -DCMAKE_CXX_COMPILER=${{ matrix.ci.compiler }} -DCMAKE_CXX_STANDARD=${{ matrix.ci.cxxstd }} -DBUILD_DOCUMENTATION=YES -DCMAKE_BUILD_TYPE=${{ matrix.ci.build_type }} ..
+ cmake ${{ matrix.ci.cmake_extra }} -DCMAKE_CXX_COMPILER=${{ matrix.ci.compiler }} -DCMAKE_CXX_STANDARD=${{ matrix.ci.cxxstd }} -DBUILD_DOCUMENTATION=YES -DCMAKE_BUILD_TYPE=${{ matrix.ci.build_type }} ..
make -j 2
cmake --build . --target docs
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 897e34c..896dfb8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -48,7 +48,7 @@ option(BUILD_SHARED_LIBS "Build GEOS with shared libraries" ON)
set(CMAKE_CXX_STANDARD 11 CACHE STRING "C++ standard version to use (default is 11)")
## GEOS custom variables
-option(BUILD_BENCHMARKS "Build GEOS benchmarks" ON)
+option(BUILD_BENCHMARKS "Build GEOS benchmarks" OFF)
cmake_dependent_option(GEOS_BUILD_DEVELOPER
"Build with compilation flags useful for development" ON
"GEOS_BUILD_FROM_GIT" OFF)
diff --git a/include/geos/algorithm/CGAlgorithmsDD.h b/include/geos/algorithm/CGAlgorithmsDD.h
index ba4bf0c..8bab435 100644
--- a/include/geos/algorithm/CGAlgorithmsDD.h
+++ b/include/geos/algorithm/CGAlgorithmsDD.h
@@ -16,8 +16,8 @@
*
**********************************************************************/
-#ifndef GEOS_ALGORITHM_CGALGORITHMDD_H
-#define GEOS_ALGORITHM_CGALGORITHMDD_H
+#pragma once
+
#include <geos/export.h>
#include <geos/inline.h>
#include <geos/math/DD.h>
@@ -157,7 +157,6 @@ protected:
} // namespace geos
#ifdef GEOS_INLINE
-#include "geos/algorithm/CGAlgorithmsDD.inl"
+# include "geos/algorithm/CGAlgorithmsDD.inl"
#endif
-#endif // GEOS_ALGORITHM_CGALGORITHM_H
diff --git a/include/geos/operation/overlayng/Edge.h b/include/geos/operation/overlayng/Edge.h
index f51808d..c91412a 100644
--- a/include/geos/operation/overlayng/Edge.h
+++ b/include/geos/operation/overlayng/Edge.h
@@ -17,6 +17,7 @@
#include <geos/inline.h>
#include <geos/operation/overlayng/OverlayLabel.h>
#include <geos/geom/Coordinate.h>
+#include <geos/geom/CoordinateSequence.h>
#include <geos/export.h>
#include <memory>
@@ -25,7 +26,6 @@
namespace geos {
namespace geom {
class Coordinate;
-class CoordinateSequence;
}
namespace operation {
namespace overlayng {
diff --git a/include/geos/operation/overlayng/EdgeSourceInfo.h b/include/geos/operation/overlayng/EdgeSourceInfo.h
index 650dbd5..547be33 100644
--- a/include/geos/operation/overlayng/EdgeSourceInfo.h
+++ b/include/geos/operation/overlayng/EdgeSourceInfo.h
@@ -16,7 +16,7 @@
#include <geos/geom/Dimension.h>
#include <geos/export.h>
-
+#include <cstdint>
namespace geos { // geos.
namespace operation { // geos.operation
diff --git a/include/geos/operation/valid/IsSimpleOp.h b/include/geos/operation/valid/IsSimpleOp.h
index 7a8043d..8d72bb8 100644
--- a/include/geos/operation/valid/IsSimpleOp.h
+++ b/include/geos/operation/valid/IsSimpleOp.h
@@ -17,6 +17,8 @@
#pragma once
+#include <memory>
+
#include <geos/algorithm/LineIntersector.h>
#include <geos/algorithm/BoundaryNodeRule.h>
#include <geos/noding/SegmentIntersector.h>
diff --git a/src/algorithm/CGAlgorithmsDD.cpp b/src/algorithm/CGAlgorithmsDD.cpp
index 89bd709..09cd748 100644
--- a/src/algorithm/CGAlgorithmsDD.cpp
+++ b/src/algorithm/CGAlgorithmsDD.cpp
@@ -188,11 +188,10 @@ CGAlgorithmsDD::detDD(const DD& x1, const DD& y1, const DD& x2, const DD& y2)
return (x1 * y2) - (y1 * x2);
}
-#ifndef GEOS_INLINE
-#include "geos/algorithm/CGAlgorithmsDD.inl"
-#endif
-
} // namespace geos::algorithm
} // namespace geos
+#ifndef GEOS_INLINE
+# include "geos/algorithm/CGAlgorithmsDD.inl"
+#endif
diff --git a/src/noding/NodingIntersectionFinder.cpp b/src/noding/NodingIntersectionFinder.cpp
index eb1ad19..7ee56f8 100644
--- a/src/noding/NodingIntersectionFinder.cpp
+++ b/src/noding/NodingIntersectionFinder.cpp
@@ -98,9 +98,10 @@ NodingIntersectionFinder::processIntersections(
}
}
+} // namespace geos.noding
+} // namespace geos
+
#ifndef GEOS_INLINE
-#include "geos/noding/NodingIntersectionFinder.inl"
+# include "geos/noding/NodingIntersectionFinder.inl"
#endif
-} // namespace geos.noding
-} // namespace geos
diff --git a/src/operation/overlayng/OverlayLabel.cpp b/src/operation/overlayng/OverlayLabel.cpp
index 0f73fc8..6e8ab77 100644
--- a/src/operation/overlayng/OverlayLabel.cpp
+++ b/src/operation/overlayng/OverlayLabel.cpp
@@ -14,14 +14,14 @@
#include <geos/operation/overlayng/OverlayLabel.h>
+#ifndef GEOS_INLINE
+# include "geos/operation/overlayng/OverlayLabel.inl"
+#endif
+
namespace geos { // geos
namespace operation { // geos.operation
namespace overlayng { // geos.operation.overlayng
-#ifndef GEOS_INLINE
-#include "geos/operation/overlayng/OverlayLabel.inl"
-#endif
-
/*public*/
void
OverlayLabel::initBoundary(uint8_t index, Location locLeft, Location locRight, bool p_isHole)
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index a6976c4..bca1519 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -61,7 +61,7 @@ if(NOT MSVC)
configure_install_geos_pc()
endif()
-option(BUILD_ASTYLE "Build astyle (Artistic Style) tool" ON)
+option(BUILD_ASTYLE "Build astyle (Artistic Style) tool" OFF)
message(STATUS "GEOS: Build astyle ${BUILD_ASTYLE}")
if(BUILD_ASTYLE)
-----------------------------------------------------------------------
Summary of changes:
.github/workflows/ci.yml | 16 +++++++++++++---
CMakeLists.txt | 2 +-
include/geos/algorithm/CGAlgorithmsDD.h | 7 +++----
include/geos/operation/overlayng/Edge.h | 2 +-
include/geos/operation/overlayng/EdgeSourceInfo.h | 2 +-
include/geos/operation/valid/IsSimpleOp.h | 2 ++
src/algorithm/CGAlgorithmsDD.cpp | 7 +++----
src/noding/NodingIntersectionFinder.cpp | 7 ++++---
src/operation/overlayng/OverlayLabel.cpp | 8 ++++----
tools/CMakeLists.txt | 2 +-
10 files changed, 33 insertions(+), 22 deletions(-)
hooks/post-receive
--
GEOS
More information about the geos-commits
mailing list