pgRouting

Changeset 36

Show
Ignore:
Timestamp:
10/02/07 11:20:12 (1 year ago)
Author:
anton
Message:

Cmake files fixed

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • tags/1.0RC1/CMakeLists.txt

    r34 r36  
    2626  SET(LIB_DIR ${PGROUTING_BINARY_DIR}/lib) 
    2727  MESSAGE("pg_config not found, output directory for libraries is set to ${PGROUTING_BINARY_DIR}/lib") 
    28 ENDIF(LIBDIR) 
     28ENDIF(LIB_DIR) 
    2929 
    3030if(PGROUTING_CORE_INCLUDE_DIR) 
  • tags/1.0RC1/extra/CMakeLists.txt

    r30 r36  
    1 # Recurse into the "Hello" and "Demo" subdirectories.  This does not actually 
    2 # cause another cmake executable to run.  The same process will walk through 
    3 # the project's entire directory structure. 
    41SUBDIRS(tsp driving_distance) 
  • tags/1.0RC1/extra/driving_distance/CMakeLists.txt

    r30 r36  
    1 # Recurse into the "Hello" and "Demo" subdirectories.  This does not actually 
    2 # cause another cmake executable to run.  The same process will walk through 
    3 # the project's entire directory structure. 
    41SUBDIRS(src) 
  • tags/1.0RC1/extra/driving_distance/src/CMakeLists.txt

    r31 r36  
    1 #SET(LIBRARY_OUTPUT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../lib) 
     1EXEC_PROGRAM(pg_config 
     2 ARGS --libdir 
     3 OUTPUT_VARIABLE LIB_DIR) 
     4 
     5IF(LIB_DIR) 
     6  MESSAGE("Output directory for libraries is set to ${LIB_DIR}") 
     7ELSE(LIB_DIR) 
     8  SET(LIB_DIR ${PGROUTING_BINARY_DIR}/lib) 
     9  MESSAGE("pg_config not found, output directory for libraries is set to ${PGROUTING_BINARY_DIR}/lib") 
     10ENDIF(LIB_DIR) 
    211 
    312IF(UNIX) 
    4   IF(APPLE) 
    5     SET(LIBRARY_OUTPUT_PATH $ENV{DYLD_LIBRARY_PATH}) 
    6   ELSE(APPLE) 
    7     SET(LIBRARY_OUTPUT_PATH $ENV{LD_LIBRARY_PATH}) 
    8   ENDIF(APPLE) 
     13  SET(LIBRARY_OUTPUT_PATH ${LIB_DIR}) 
     14  SET(SQL_INSTALL_PATH /usr/share/postlbs) 
    915ELSE(UNIX) 
    10   SET(LIBRARY_OUTPUT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../lib) 
     16  SET(LIBRARY_OUTPUT_PATH ${PGROUTING_BINARY_DIR}/lib) 
     17  SET(SQL_INSTALL_PATH ${PGROUTING_BINARY_DIR}/lib) 
    1118ENDIF(UNIX) 
    1219 
  • tags/1.0RC1/extra/tsp/CMakeLists.txt

    r30 r36  
    1 # Recurse into the "Hello" and "Demo" subdirectories.  This does not actually 
    2 # cause another cmake executable to run.  The same process will walk through 
    3 # the project's entire directory structure. 
    41SUBDIRS(src) 
  • tags/1.0RC1/extra/tsp/src/CMakeLists.txt

    r31 r36  
    1 #SET(LIBRARY_OUTPUT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../lib) 
     1EXEC_PROGRAM(pg_config 
     2 ARGS --libdir 
     3 OUTPUT_VARIABLE LIB_DIR) 
     4 
     5IF(LIB_DIR) 
     6  MESSAGE("Output directory for libraries is set to ${LIB_DIR}") 
     7ELSE(LIB_DIR) 
     8  SET(LIB_DIR ${PGROUTING_BINARY_DIR}/lib) 
     9  MESSAGE("pg_config not found, output directory for libraries is set to ${PGROUTING_BINARY_DIR}/lib") 
     10ENDIF(LIB_DIR) 
    211 
    312IF(UNIX) 
    4   IF(APPLE) 
    5     SET(LIBRARY_OUTPUT_PATH $ENV{DYLD_LIBRARY_PATH}) 
    6   ELSE(APPLE) 
    7     SET(LIBRARY_OUTPUT_PATH $ENV{LD_LIBRARY_PATH}) 
    8   ENDIF(APPLE) 
     13  SET(LIBRARY_OUTPUT_PATH ${LIB_DIR}) 
     14  SET(SQL_INSTALL_PATH /usr/share/postlbs) 
    915ELSE(UNIX) 
    10   SET(LIBRARY_OUTPUT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../lib) 
     16  SET(LIBRARY_OUTPUT_PATH ${PGROUTING_BINARY_DIR}/lib) 
     17  SET(SQL_INSTALL_PATH ${PGROUTING_BINARY_DIR}/lib) 
    1118ENDIF(UNIX) 
    1219 
    1320ADD_LIBRARY(routing_tsp SHARED tsp.c tsp.h tsp_solver.cpp) 
    14  
    15  
    16  
    17