Changeset 31

Timestamp:

10/02/07 09:38:26 (1 year ago)

Author:

anton

Message:

Cmake scripts fixed, SQL core files fixed

Files:

• tags/1.0RC1/CMakeLists.txt (modified) (3 diffs)
• tags/1.0RC1/extra/driving_distance/sql/routing_dd.sql (modified) (2 diffs)
• tags/1.0RC1/extra/driving_distance/src/CMakeLists.txt (modified) (1 diff)
• tags/1.0RC1/extra/tsp/sql/routing_tsp.sql (modified) (1 diff)
• tags/1.0RC1/extra/tsp/src/CMakeLists.txt (modified) (1 diff)

tags/1.0RC1/CMakeLists.txt

@@ -43 +43 @@
-endif(PGROUTING_CORE_INCLUDE_DIR)
-
-N
-N
+FF
+FF
-
-# Recurse into the subdirectories.  This does not actually
@@ -61 +61 @@
-ENDIF(WITH_DD)
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-SET(PGROUTING_INCLUDE_DIRECTORIES ${PGROUTING_SOURCE_DIR}/core ${PGROUTING_SOURCE_DIR}/core/src ${PGROUTING_SOURCE_DIR}/extra ${PGROUTING_SOURCE_DIR}/extra/tsp ${PGROUTING_SOURCE_DIR}/extra/tsp/src ${PGROUTING_SOURCE_DIR}/extra/driving_distance ${PGROUTING_SOURCE_DIR}/extra/driving_distance/src
-)
@@ -70 +83 @@
-SET(CMAKE_CXX_FLAGS=-O2 -g -Wall -fpic)
-
+CONFIGURE_FILE(core/sql/routing_core.sql ${SQL_INSTALL_PATH}/routing_core.sql COPYONLY)
+CONFIGURE_FILE(core/sql/routing_core_wrappers.sql ${SQL_INSTALL_PATH}/routing_core_wrappers.sql COPYONLY)
-
+IF(WITH_TSP)
+CONFIGURE_FILE(extra/tsp/sql/routing_tsp.sql ${SQL_INSTALL_PATH}/routing_tsp.sql COPYONLY)
+CONFIGURE_FILE(extra/tsp/sql/routing_tsp_wrappers.sql ${SQL_INSTALL_PATH}/routing_tsp_wrappers.sql COPYONLY)
+ENDIF(WITH_TSP)
-
-
-
+
+
+
+

tags/1.0RC1/extra/driving_distance/sql/routing_dd.sql

@@ -22 +22 @@
-        distance float8,directed boolean, has_reverse_cost boolean)
-        RETURNS SETOF path_result
-
+_dd
-        LANGUAGE 'C' IMMUTABLE STRICT;
-                        
@@ -33 +33 @@
-CREATE OR REPLACE FUNCTION alphashape(sql text)
-        RETURNS SETOF vertex_result
-
+_dd
-        LANGUAGE 'C' IMMUTABLE STRICT;

tags/1.0RC1/extra/driving_distance/src/CMakeLists.txt

@@ -1 @@
-
+
+
+
+
+
+
+
+
+
+
+
-
-ADD_LIBRARY(routing_dd SHARED alpha.c alpha_drivedist.cpp alpha.h boost_drivedist.cpp drivedist.c drivedist.h)

tags/1.0RC1/extra/tsp/sql/routing_tsp.sql

@@ -25 +25 @@
-CREATE OR REPLACE FUNCTION tsp(sql text, ids varchar, source integer)
-        RETURNS SETOF path_result
-
+_tsp
-        LANGUAGE 'C' IMMUTABLE STRICT;

tags/1.0RC1/extra/tsp/src/CMakeLists.txt

@@ -1 @@
-
+
+
+
+
+
+
+
+
+
+
+
-
-ADD_LIBRARY(routing_tsp SHARED tsp.c tsp.h tsp_solver.cpp)