Changeset 34

Timestamp:

10/02/07 11:08:04 (1 year ago)

Author:

anton

Message:

win32 patch deleted

Files:

• tags/1.0RC1/CMakeLists.txt (modified) (4 diffs)
• tags/1.0RC1/win32 (deleted)

tags/1.0RC1/CMakeLists.txt

@@ -1 @@
-#The first, top-level directory contains the following CMakeLists.txt file.
-# The name of our project is "VISPACK".  CMakeLists files in this project can
-# refer to the root source directory of the project as ${VISPACK_SOURCE_DIR} and
-# to the root binary directory of the project as ${VISPACK_BINARY_DIR}.
-CMAKE_MINIMUM_REQUIRED(VERSION 2.3)
-PROJECT(PGROUTING)
@@ -12 +8 @@
-SET(PGROUTING_VERSION_PATCH "0")
-
-
+.${PGROUTING_VERSION_PATCH}-RC1
-
-add_subdirectory(cmake)
@@ -20 +16 @@
-
-macro_optional_find_package(PostgreSQL)
+
+EXEC_PROGRAM(pg_config
+ ARGS --libdir
+ OUTPUT_VARIABLE LIB_DIR)
+
+IF(LIB_DIR)
+  MESSAGE("Output directory for libraries is set to ${LIB_DIR}")
+ELSE(LIB_DIR)
+  SET(LIB_DIR ${PGROUTING_BINARY_DIR}/lib)
+  MESSAGE("pg_config not found, output directory for libraries is set to ${PGROUTING_BINARY_DIR}/lib")
+ENDIF(LIBDIR)
-
-if(PGROUTING_CORE_INCLUDE_DIR)
@@ -64 +71 @@
-
-IF(UNIX)
-
-
-
-
-
+
-  SET(SQL_INSTALL_PATH /usr/share/postlbs)
-ELSE(UNIX)
-  SET(LIBRARY_OUTPUT_PATH ${PGROUTING_BINARY_DIR}/lib)
-
+${PGROUTING_BINARY_DIR}/
-ENDIF(UNIX)
-
-IF(LIBRARY_OUTPUT_PATH)
-  MESSAGE("Library output directory not found. All libraries will be built at ./lib directory")
-  SET(LIBRARY_OUTPUT_PATH ${PGROUTING_BINARY_DIR}/lib)
-ENDIF(LIBRARY_OUTPUT_PATH)
-
-
-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
-)
-
-# Make sure the compiler can find include files from our Hello library.
-INCLUDE_DIRECTORIES(. ${PGROUTING_INCLUDE_DIRECTORIES})
-