Revert "2.1.1 changes"

This reverts commit 70c0387.

Author: runette

CMakeLists.txt

@@ -2,10 +2,16 @@
 
 cmake_minimum_required(VERSION 3.9)
 
-project(pdal-c LANGUAGES C CXX)
+project(pdal-c C CXX)
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
 
+# Use C11 and C++11 standards
+set(CMAKE_C_STANDARD 11)
+set(CMAKE_CXX_STANDARD 11)
+
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
 
 # Install to the build directory
 if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
@@ -51,4 +57,4 @@ if(PDALC_ENABLE_TESTS)
 	include(CTest)
 	add_subdirectory("tests/data")
 	add_subdirectory("tests/pdal")
-endif()
+endif()

tests/pdal/CMakeLists.txt

@@ -6,15 +6,15 @@ set(CONFIGS )
 
 IF (CONDA_BUILD)
 	set(SOURCES
-		main_conda
-		test_pdalc_config
-		test_pdalc_utils
+		main_conda.c
+		test_pdalc_config.c
+		test_pdalc_utils.c
 	)
 ELSE()
 	set(SOURCES
-		main
-		test_pdalc_config
-		test_pdalc_utils
+		main.c
+		test_pdalc_config.c
+		test_pdalc_utils.c
 	)
 ENDIF()
 
@@ -67,4 +67,4 @@ install(TARGETS ${TARGET}
 	LIBRARY DESTINATION lib
 	RUNTIME DESTINATION bin)
 
-set(TARGET test_pdalc)
+set(TARGET test_pdalc)

tests/pdal/test_pdalc_config.cpp tests/pdal/test_pdalc_config.ctests/pdal/test_pdalc_config.cpp renamed to tests/pdal/test_pdalc_config.c

@@ -32,6 +32,7 @@
 #include <assert.h>
 
 #include <pdal/pdalc_config.h>
+#include <pdal/gitsha.h>
 #include <pdal/pdal_features.hpp>
 
 #include "greatest.h"
@@ -40,16 +41,16 @@ SUITE(test_pdalc_config);
 
 TEST testPDALGetSetGdalDataPath(void)
 {
-    size_t size = pdal::capi::PDALGetGdalDataPath(NULL, 1024);
+    size_t size = PDALGetGdalDataPath(NULL, 1024);
     ASSERT_EQ(0, size);
 
     char *original = getenv("GDAL_DATA");
     char path[1024];
 
-    size = pdal::capi::PDALGetGdalDataPath(path, 0);
+    size = PDALGetGdalDataPath(path, 0);
     ASSERT_EQ(0, size);
 
-    size = pdal::capi::PDALGetGdalDataPath(path, 1024);
+    size = PDALGetGdalDataPath(path, 1024);
 
     if (original)
     {
@@ -62,28 +63,28 @@ TEST testPDALGetSetGdalDataPath(void)
     }
 
     const char *expected = "An arbitrary string set as the GDAL data path";
-    pdal::capi::PDALSetGdalDataPath(expected);
-    size = pdal::capi::PDALGetGdalDataPath(path, 1024);
+    PDALSetGdalDataPath(expected);
+    size = PDALGetGdalDataPath(path, 1024);
     ASSERT_STR_EQ(expected, path);
     ASSERT_EQ(size, strlen(path));
 
-    pdal::capi::PDALSetGdalDataPath(original);
+    PDALSetGdalDataPath(original);
 
     PASS();
 }
 
 TEST testPDALGetSetProj4DataPath(void)
 {
-    size_t size = pdal::capi::PDALGetProj4DataPath(NULL, 1024);
+    size_t size = PDALGetProj4DataPath(NULL, 1024);
     ASSERT_EQ(0, size);
 
     char *original = getenv("PROJ_LIB");
     char path[1024];
 
-    size = pdal::capi::PDALGetProj4DataPath(path, 0);
+    size = PDALGetProj4DataPath(path, 0);
     ASSERT_EQ(0, size);
 
-    size = pdal::capi::PDALGetProj4DataPath(path, 1024);
+    size = PDALGetProj4DataPath(path, 1024);
 
     if (original)
     {
@@ -96,33 +97,37 @@ TEST testPDALGetSetProj4DataPath(void)
     }
 
     const char *expected = "An arbitrary string set as the proj4 data path";
-    pdal::capi::PDALSetProj4DataPath(expected);
-    size = pdal::capi::PDALGetProj4DataPath(path, 1024);
+    PDALSetProj4DataPath(expected);
+    size = PDALGetProj4DataPath(path, 1024);
     ASSERT_STR_EQ(expected, path);
     ASSERT_EQ(size, strlen(path));
 
-    pdal::capi::PDALSetProj4DataPath(original);
+    PDALSetProj4DataPath(original);
 
     PASS();
 }
 
 TEST testPDALVersionInfo(void)
 {
+    int versionInteger = PDALVersionInteger();
+    ASSERT_EQ(PDAL_VERSION_INTEGER, versionInteger);
 
-    int major = pdal::capi::PDALVersionMajor();
+    int major = PDALVersionMajor();
     ASSERT_EQ(PDAL_VERSION_MAJOR, major);
 
-    int minor = pdal::capi::PDALVersionMinor();
+    int minor = PDALVersionMinor();
     ASSERT_EQ(PDAL_VERSION_MINOR, minor);
 
-    int patch = pdal::capi::PDALVersionPatch();
+    int patch = PDALVersionPatch();
     ASSERT_EQ(PDAL_VERSION_PATCH, patch);
 
+    ASSERT_EQ(major*10000 + minor*100 + patch, versionInteger);
+
     char expected[64];
     sprintf(expected, "%d.%d.%d", major, minor, patch);
 
     char version[64];
-    size_t size = pdal::capi::PDALVersionString(version, 64);
+    size_t size = PDALVersionString(version, 64);
     ASSERT(size > 0 && size <= 64);
     ASSERT(version[0]);
     ASSERT_STR_EQ(expected, version);
@@ -134,7 +139,7 @@ TEST testPDALVersionInfo(void)
 #endif
 
     char sha1[64];
-    size = pdal::capi::PDALSha1(sha1, 64);
+    size = PDALSha1(sha1, 64);
     ASSERT(size > 0 && size <= 64);
     ASSERT(sha1[0]);
 
@@ -147,7 +152,7 @@ TEST testPDALVersionInfo(void)
     sprintf(expected + strlen(version), " (git-version: %s)", sha1);
 
     char fullVersion[64];
-    size = pdal::capi::PDALFullVersionString(fullVersion, 64);
+    size = PDALFullVersionString(fullVersion, 64);
     ASSERT(size > 0 && size <= 64);
     ASSERT(fullVersion[0]);
     ASSERT_STR_EQ(expected, fullVersion);
@@ -158,7 +163,7 @@ TEST testPDALVersionInfo(void)
 TEST testPDALDebugInformation(void)
 {
     char info[1024];
-    size_t size = pdal::capi::PDALDebugInformation(info, 1024);
+    size_t size = PDALDebugInformation(info, 1024);
     ASSERT(size > 0 && size <= 1024);
     ASSERT(info[0]);
     PASS();