Changeset View
Changeset View
Standalone View
Standalone View
converters/osm2pgrouting/files/patch-CMakeLists.txt
- This file was added.
Property | Old Value | New Value |
---|---|---|
fbsd:nokeywords | null | yes \ No newline at end of property |
svn:eol-style | null | native \ No newline at end of property |
svn:mime-type | null | text/plain \ No newline at end of property |
--- CMakeLists.txt.orig 2017-12-18 15:44:24 UTC | |||||
+++ CMakeLists.txt | |||||
@@ -1,11 +1,11 @@ | |||||
PROJECT(osm2pgrouting) | |||||
CMAKE_MINIMUM_REQUIRED(VERSION 2.6) | |||||
-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() | |||||
+#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") | |||||
@@ -106,7 +106,7 @@ TARGET_LINK_LIBRARIES(osm2pgrouting | |||||
) | |||||
INSTALL(TARGETS osm2pgrouting | |||||
- RUNTIME DESTINATION "/usr/bin" | |||||
+ RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin" | |||||
) | |||||
if(WIN32) | |||||
@@ -114,13 +114,15 @@ if(WIN32) | |||||
endif() | |||||
INSTALL(FILES | |||||
- "${CMAKE_SOURCE_DIR}/COPYING" | |||||
"${CMAKE_SOURCE_DIR}/Readme.md" | |||||
+ DESTINATION "${CMAKE_INSTALL_PREFIX}/share/doc/osm2pgrouting") | |||||
+ | |||||
+INSTALL(FILES | |||||
"${CMAKE_SOURCE_DIR}/mapconfig.xml" | |||||
"${CMAKE_SOURCE_DIR}/mapconfig_for_cars.xml" | |||||
"${CMAKE_SOURCE_DIR}/mapconfig_for_bicycles.xml" | |||||
"${CMAKE_SOURCE_DIR}/mapconfig_for_pedestrian.xml" | |||||
- DESTINATION "${SHARE_DIR}") | |||||
+ DESTINATION "${CMAKE_INSTALL_PREFIX}/etc") | |||||
#INCLUDE_DIRECTORIES( ${Boost_INCLUDE_DIR} ) |