[mapguide-commits] r9263 - sandbox/jng/cmake_v2/Common/Geometry

[svn_mapguide at osgeo.org]

Author: jng
Date: 2017-12-25 06:50:51 -0800 (Mon, 25 Dec 2017)
New Revision: 9263

Added:
   sandbox/jng/cmake_v2/Common/Geometry/GeosInclude.h
Modified:
   sandbox/jng/cmake_v2/Common/Geometry/Geometry.vcxproj
   sandbox/jng/cmake_v2/Common/Geometry/Geometry.vcxproj.filters
   sandbox/jng/cmake_v2/Common/Geometry/GeometrySimplifier.cpp
   sandbox/jng/cmake_v2/Common/Geometry/GeosUtil.cpp
Log:
On Ubuntu geos.h is not installed by libgeos++-dev so as a workaround, add our own GeosInclude.h that includes the key headers of the GEOS C++ API and have our usages of GEOS include this header instead.

Modified: sandbox/jng/cmake_v2/Common/Geometry/Geometry.vcxproj
===================================================================
--- sandbox/jng/cmake_v2/Common/Geometry/Geometry.vcxproj	2017-12-25 13:32:47 UTC (rev 9262)
+++ sandbox/jng/cmake_v2/Common/Geometry/Geometry.vcxproj	2017-12-25 14:50:51 UTC (rev 9263)
@@ -906,6 +906,7 @@
     <ClInclude Include="Exception\InvalidCoordinateSystemUnitsException.h" />
     <ClInclude Include="GeometrySimplifier.h" />
     <ClInclude Include="GeometrySimplificationAlgorithmType.h" />
+    <ClInclude Include="GeosInclude.h" />
     <ClInclude Include="Parse\Array.h" />
     <ClInclude Include="Parse\ArrayHelper.h" />
     <ClInclude Include="Parse\LexAwkt.h" />

Modified: sandbox/jng/cmake_v2/Common/Geometry/Geometry.vcxproj.filters
===================================================================
--- sandbox/jng/cmake_v2/Common/Geometry/Geometry.vcxproj.filters	2017-12-25 13:32:47 UTC (rev 9262)
+++ sandbox/jng/cmake_v2/Common/Geometry/Geometry.vcxproj.filters	2017-12-25 14:50:51 UTC (rev 9263)
@@ -975,6 +975,7 @@
     <ClInclude Include="GeometrySimplifier.h" />
     <ClInclude Include="GeometrySimplificationAlgorithmType.h" />
     <ClInclude Include="PreparedGeometry.h" />
+    <ClInclude Include="GeosInclude.h" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="Geometry.rc" />

Modified: sandbox/jng/cmake_v2/Common/Geometry/GeometrySimplifier.cpp
===================================================================
--- sandbox/jng/cmake_v2/Common/Geometry/GeometrySimplifier.cpp	2017-12-25 13:32:47 UTC (rev 9262)
+++ sandbox/jng/cmake_v2/Common/Geometry/GeometrySimplifier.cpp	2017-12-25 14:50:51 UTC (rev 9263)
@@ -15,7 +15,7 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-#include "geos.h"
+#include "GeosInclude.h"
 #include "geos/simplify/DouglasPeuckerSimplifier.h"
 #include "geos/simplify/TopologyPreservingSimplifier.h"
 

Added: sandbox/jng/cmake_v2/Common/Geometry/GeosInclude.h
===================================================================
--- sandbox/jng/cmake_v2/Common/Geometry/GeosInclude.h	                        (rev 0)
+++ sandbox/jng/cmake_v2/Common/Geometry/GeosInclude.h	2017-12-25 14:50:51 UTC (rev 9263)
@@ -0,0 +1,27 @@
+//
+//  Copyright (C) 2004-2017 by Autodesk, Inc.
+//
+//  This library is free software; you can redistribute it and/or
+//  modify it under the terms of version 2.1 of the GNU Lesser
+//  General Public License as published by the Free Software Foundation.
+//
+//  This library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//  Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if not, write to the Free Software
+//  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+//
+
+#ifndef _GEOMETRY_GEOS_INCLUDE_H
+#define _GEOMETRY_GEOS_INCLUDE_H
+
+#include <geos/version.h>
+#include <geos/geom.h>
+#include <geos/util.h>
+#include <geos/io.h>
+#include <geos/unload.h>
+
+#endif
\ No newline at end of file

Modified: sandbox/jng/cmake_v2/Common/Geometry/GeosUtil.cpp
===================================================================
--- sandbox/jng/cmake_v2/Common/Geometry/GeosUtil.cpp	2017-12-25 13:32:47 UTC (rev 9262)
+++ sandbox/jng/cmake_v2/Common/Geometry/GeosUtil.cpp	2017-12-25 14:50:51 UTC (rev 9263)
@@ -18,7 +18,7 @@
 // disable C4244 of io.h about int64 assigned to unsigned long
 #pragma warning(push)
 #pragma warning(disable: 4244)
-#include "geos.h"
+#include "GeosInclude.h"
 #pragma warning(pop)
 
 #include "GeometryCommon.h"