[mapguide-commits] r9623 - in sandbox/jng/mvt_alt: . Common/Renderers Common/Renderers/mvt Server/src/UnitTesting

[svn_mapguide at osgeo.org]

Author: jng
Date: 2019-09-23 22:14:46 -0700 (Mon, 23 Sep 2019)
New Revision: 9623

Modified:
   sandbox/jng/mvt_alt/CMakeLists.txt
   sandbox/jng/mvt_alt/Common/Renderers/CMakeLists.txt
   sandbox/jng/mvt_alt/Common/Renderers/MVTRenderer.cpp
   sandbox/jng/mvt_alt/Common/Renderers/mvt/mvt_port.h
   sandbox/jng/mvt_alt/Server/src/UnitTesting/CMakeLists.txt
Log:
Fix linux build

Modified: sandbox/jng/mvt_alt/CMakeLists.txt
===================================================================
--- sandbox/jng/mvt_alt/CMakeLists.txt	2019-09-24 04:16:35 UTC (rev 9622)
+++ sandbox/jng/mvt_alt/CMakeLists.txt	2019-09-24 05:14:46 UTC (rev 9623)
@@ -62,13 +62,13 @@
 
 if (NOT MG_VERSION_MAJOR)
     set(MG_VERSION_MAJOR 4)
-endif (MG_VERSION_MAJOR)
+endif (NOT MG_VERSION_MAJOR)
 if (NOT MG_VERSION_MINOR)
     set(MG_VERSION_MINOR 0)
-endif (MG_VERSION_MINOR)
+endif (NOT MG_VERSION_MINOR)
 if (NOT MG_VERSION_RELEASE)
     set(MG_VERSION_RELEASE 0)
-endif (MG_VERSION_RELEASE)
+endif (NOT MG_VERSION_RELEASE)
 if (NOT MG_VERSION_REV)
     set(MG_VERSION_REV 0)
 endif (NOT MG_VERSION_REV)

Modified: sandbox/jng/mvt_alt/Common/Renderers/CMakeLists.txt
===================================================================
--- sandbox/jng/mvt_alt/Common/Renderers/CMakeLists.txt	2019-09-24 04:16:35 UTC (rev 9622)
+++ sandbox/jng/mvt_alt/Common/Renderers/CMakeLists.txt	2019-09-24 05:14:46 UTC (rev 9623)
@@ -40,6 +40,8 @@
     KmlIconStyle.cpp
     KmlRenderer.cpp
     MapQuantization.cpp
+    mvt/mvt_tile.cpp
+    MVTRenderer.cpp
     ObservationMesh.cpp
     RenderUtil.cpp
     RS_ByteData.cpp

Modified: sandbox/jng/mvt_alt/Common/Renderers/MVTRenderer.cpp
===================================================================
--- sandbox/jng/mvt_alt/Common/Renderers/MVTRenderer.cpp	2019-09-24 04:16:35 UTC (rev 9622)
+++ sandbox/jng/mvt_alt/Common/Renderers/MVTRenderer.cpp	2019-09-24 05:14:46 UTC (rev 9623)
@@ -18,6 +18,7 @@
 #include "MVTRenderer.h"
 #include "RS_FeatureReader.h"
 #include "UnicodeString.h"
+#include <cmath>
 #include "mvt/gpb.h"
 #include "mvt/mvt_tile.h"
 

Modified: sandbox/jng/mvt_alt/Common/Renderers/mvt/mvt_port.h
===================================================================
--- sandbox/jng/mvt_alt/Common/Renderers/mvt/mvt_port.h	2019-09-24 04:16:35 UTC (rev 9622)
+++ sandbox/jng/mvt_alt/Common/Renderers/mvt/mvt_port.h	2019-09-24 05:14:46 UTC (rev 9623)
@@ -291,8 +291,8 @@
 #  define CPL_MSBPTR64(x)       CPL_SWAP64PTR(x)
 #endif
 
-#define CPLError(x)
+#define CPLError(a, b, c, d)
 
-#define CPLDebug(x)
+#define CPLDebug(a, b, c, d)
 
 #endif
\ No newline at end of file

Modified: sandbox/jng/mvt_alt/Server/src/UnitTesting/CMakeLists.txt
===================================================================
--- sandbox/jng/mvt_alt/Server/src/UnitTesting/CMakeLists.txt	2019-09-24 04:16:35 UTC (rev 9622)
+++ sandbox/jng/mvt_alt/Server/src/UnitTesting/CMakeLists.txt	2019-09-24 05:14:46 UTC (rev 9623)
@@ -7,6 +7,7 @@
     ${MG_COMMON_DIR}/MapGuideCommon
     ${MG_COMMON_DIR}/MdfModel
     ${MG_COMMON_DIR}/MdfParser
+    ${MG_COMMON_DIR}/Renderers
     ${MG_COMMON_DIR}/Stylization
     ${MG_SERVER_COMMON_DIR}
     ${MG_SERVER_COMMON_DIR}/Manager