Merge pull request #798 from cvvergara/fix/postgres10

Fix/postgres10

Author: cvvergara

CMakeLists.txt

@@ -349,9 +349,8 @@ if(WIN32)
 endif(WIN32)
 
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DPGSQL_VERSION=${PGSQL_VERSION}")
+set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DPGSQL_VERSION=${PGSQL_VERSION}")
 set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -DPGSQL_VERSION=${PGSQL_VERSION}")
-message(STATUS "PGSQL_VERSION=${PGSQL_VERSION}")
-
 
 
 #---------------------------------------------
@@ -482,24 +481,28 @@ endif()
 #compiler directives
 #+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
+# for UNIX & JENKINS
 if(UNIX OR (WIN32 AND NOT MSVC))
     set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}  -std=gnu99")
 endif()
 
-
-CHECK_C_COMPILER_FLAG("-frounding-math" C_COMPILER_SUPPORTS_ROUNDING_MATH)
-CHECK_CXX_COMPILER_FLAG("-frounding-math" CXX_COMPILER_SUPPORTS_ROUNDING_MATH)
-
-
 if(NOT WIN32)
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC ")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC ")
+    CHECK_C_COMPILER_FLAG("-fPIC" C_COMPILER_SUPPORTS_FPIC)
+    CHECK_CXX_COMPILER_FLAG("-fPIC" CXX_COMPILER_SUPPORTS_FPIC)
+    if(C_COMPILER_SUPPORTS_FPIC)
+        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC ")
+    endif()
+    if(CXX_COMPILER_SUPPORTS_FPIC)
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC ")
+    endif()
 endif()
 
 if(WIN32 AND MSVC)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_C_FLAGS}")
 endif()
 
+CHECK_C_COMPILER_FLAG("-frounding-math" C_COMPILER_SUPPORTS_ROUNDING_MATH)
+CHECK_CXX_COMPILER_FLAG("-frounding-math" CXX_COMPILER_SUPPORTS_ROUNDING_MATH)
 if(C_COMPILER_SUPPORTS_ROUNDING_MATH)
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -frounding-math ")
 endif()
@@ -511,6 +514,8 @@ endif()
 set(CMAKE_C_FLAGS_DEBUG   "${CMAKE_C_FLAGS_DEBUG}   -Wall -Wconversion -pedantic -Wmissing-prototypes -W -Wunused -Wuninitialized -Wextra -Wdouble-promotion")
 set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall -fno-implicit-inline-templates -Wconversion -pedantic -W -Wunused -Wuninitialized -Wextra -Wdouble-promotion")
 
+
+
 #+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 if (PGROUTING_DEBUG)
@@ -589,7 +594,6 @@ add_library(${PGROUTING_LIB_NAME}
     ${LIBRARY_MODE_TARGET}
     ${PGROUTING_OBJECTS})
 
-install(TARGETS ${PGROUTING_LIB_NAME} DESTINATION ${LIBRARY_INSTALL_PATH})
 
 
 if(APPLE)
@@ -618,24 +622,8 @@ add_subdirectory(sql)
 #-----------------------------------------------------------------------------
 #-----------------------------------------------------------------------------
 
-if (WIN32 AND MSVC)
-    SET (LIBS_TO_INSTALL "${CMAKE_BINARY_DIR}/lib/Release/libpgrouting-2.5.dll")
-else()
-    SET (LIBS_TO_INSTALL "${CMAKE_BINARY_DIR}/lib/libpgrouting-2.5.so")
-endif()
-
-# this will create the commands in the makefile under the install target
-#if(UNIX)
-#    file(GLOB_RECURSE LIBS_TO_INSTALL "${CMAKE_BINARY_DIR}/lib/*.so")
-#else()
-#    file(GLOB_RECURSE LIBS_TO_INSTALL "${CMAKE_BINARY_DIR}/lib/*.dll")
-#endif()
-
-message(STATUS "LIBS_TO_INSTALL=${LIBS_TO_INSTALL}")
-
-install(FILES ${LIBS_TO_INSTALL}  DESTINATION ${LIB_DIR})
-
 
+install(TARGETS ${PGROUTING_LIB_NAME} DESTINATION ${LIBRARY_INSTALL_PATH})
 install(FILES
     ${PgRouting_SQL_FILES_TO_INSTALL}
     DESTINATION "${SHARE_DIR}"

include/c_common/postgres_connection.h

@@ -31,6 +31,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #pragma GCC diagnostic ignored "-pedantic"
 #endif
 
+#ifdef __clang__
+#pragma clang diagnostic ignored "-pedantic"
+#endif
+
 #include <postgres.h>
 
 
@@ -40,6 +44,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #pragma GCC diagnostic ignored "-Wunused-parameter"
 #endif
 
+#ifdef __clang__
+#pragma clang diagnostic ignored "-Wsign-conversion"
+#pragma clang diagnostic ignored "-Wunused-parameter"
+#endif
+
 #include "executor/spi.h"
 
 #ifdef __GNUC__
@@ -48,12 +57,21 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #pragma GCC diagnostic pop
 #endif
 
+#ifdef __clang__
+#pragma clang diagnostic pop
+#pragma clang diagnostic pop
+#pragma clang diagnostic pop
+#endif
+
 #include "utils/builtins.h"  // for text_to_cstring
 
 #if PGSQL_VERSION > 92
 #include "access/htup_details.h"
 #endif
 
+#ifdef __clang__
+#pragma clang diagnostic ignored "-Wunused-parameter"
+#endif
 
 #ifdef __GNUC__
 #pragma GCC diagnostic ignored "-Wunused-parameter"
@@ -66,6 +84,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #pragma GCC diagnostic pop
 #endif
 
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
 
 void pgr_send_error(int errcode);
 void pgr_SPI_finish(void);

sql-scripts/scripts/build-extension-file.pl

@@ -24,6 +24,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 #include "c_common/postgres_connection.h"
 
+#if PGSQL_VERSION == 100
+#include <float.h>
+#endif
+
 #include "catalog/pg_type.h"
 
 #include <stdint.h>

src/alpha_shape/src/alpha.c

@@ -29,6 +29,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #include <float.h>
 #endif
 
+#if PGSQL_VERSION == 100
+#include <float.h>
+#endif
+
+
 #include "c_types/column_info_t.h"
 
 #include "c_common/debug_macro.h"

src/common/src/vehicles_input.c

@@ -11,12 +11,12 @@ SELECT pgr_labelGraph('edge_table', 'id', 'source', 'target', 'subgraph');
  OK
 (1 row)
 
-SELECT subgraph, count(*) FROM edge_table group by subgraph;
- subgraph | count 
-----------+-------
-        1 |    16
-        3 |     1
-        2 |     1
+SELECT DISTINCT subgraph FROM edge_table ORDER BY subgraph;
+ subgraph 
+----------
+        1
+        2
+        3
 (3 rows)
 
 --q2

src/label_graph/test/doc-pgr_labelGraph.result

@@ -1,5 +1,5 @@
 \echo --q1
 SET client_min_messages TO WARNING;
 SELECT pgr_labelGraph('edge_table', 'id', 'source', 'target', 'subgraph');
-SELECT subgraph, count(*) FROM edge_table group by subgraph;
+SELECT DISTINCT subgraph FROM edge_table ORDER BY subgraph;
 \echo --q2

src/label_graph/test/doc-pgr_labelGraph.test.sql

@@ -288,7 +288,7 @@ pickDeliverEuclidean(PG_FUNCTION_ARGS) {
         values[2] = Int64GetDatum(result_tuples[call_cntr].vehicle_id);
         values[3] = Int32GetDatum(result_tuples[call_cntr].vehicle_seq);
         values[4] = Int64GetDatum(result_tuples[call_cntr].order_id);
-        values[5] = Int64GetDatum(result_tuples[call_cntr].stop_type + 1);
+        values[5] = Int32GetDatum(result_tuples[call_cntr].stop_type + 1);
         values[6] = Float8GetDatum(result_tuples[call_cntr].cargo);
         values[7] = Float8GetDatum(result_tuples[call_cntr].travelTime);
         values[8] = Float8GetDatum(result_tuples[call_cntr].arrivalTime);