Merge pull request #212 from pgRouting/develop

Develop

.gitignore

@@ -8,8 +8,14 @@ fix_typos
 *.o
 *.out
 *.osm
+*.osm.bz2
+*.osm.gz
+*.tar.gz
 *~
 .project
 .cproject
 .vagrant
 run.sh
+LOG.txt
+.directory
+*.swp

.travis.yml

@@ -7,20 +7,13 @@
 
 #choose precise or trusty
 
-#group: edge
-#dist: trusty    
-
-#dist: precise
-
+dist: trusty
 
 language: cpp
 
 compiler:
     - gcc
 
-#notifications:
-#  email:
-#    on_failure: [email protected]
 
 env: POSTGRESQL_VERSION=9.6   PG_USER=postgres DIST=precise
 
@@ -30,22 +23,16 @@ matrix:
 
     - os: linux
       sudo: required
-      dist: trusty
-      group: edge
       env: POSTGRESQL_VERSION=9.6   PG_USER=postgres DIST=trusty
 
 
     - os: linux
       sudo: required
-      dist: trusty
-      group: edge
       env: POSTGRESQL_VERSION=9.5   PG_USER=postgres DIST=trusty
 
 
     - os: linux
       sudo: required
-      dist: trusty
-      group: edge
       env: POSTGRESQL_VERSION=9.4   PG_USER=postgres DIST=trusty
 
 
@@ -54,7 +41,7 @@ matrix:
 addons:
   apt:
     sources:
-      - - ubuntu-toolchain-r-test
+      - ubuntu-toolchain-r-test
       # For cmake
       - kubuntu-backports
       - boost-latest

CMakeLists.txt

@@ -1,13 +1,20 @@
 PROJECT(osm2pgrouting)
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 
-set (CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
-set (SHARE_DIR "/usr/share/osm2pgrouting")
+if ( ${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR} )
+    message(FATAL_ERROR "In-source builds not allowed.
+    Please make a new directory (called a build directory) and run CMake from there.
+    You may need to remove CMakeCache.txt." )
+endif()
+
+LIST(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
+SET(SHARE_DIR "/usr/share/osm2pgrouting")
 
 FIND_PACKAGE(PostgreSQL REQUIRED)
 find_package(LibPQXX REQUIRED)
 FIND_PACKAGE(EXPAT REQUIRED)
 
+
 FIND_PACKAGE(Boost)
 if(Boost_INCLUDE_DIRS)
     message(STATUS "Boost headers were found here: ${Boost_INCLUDE_DIRS}")