[osrm] 10/12: Undo changes from fix-build patch in upstream sources.

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository osrm.

commit be637cbdcd1da0cb160c9dffd3d12816e7eb9a9c
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Apr 4 20:29:23 2015 +0200

    Undo changes from fix-build patch in upstream sources.
---
 CMakeLists.txt           |  5 +----
 cmake/check_stxxl.cmake  | 24 ------------------------
 debian/patches/fix-build |  6 +++---
 3 files changed, 4 insertions(+), 31 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7c5b638..b6a40f9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -172,7 +172,7 @@ endif()
 
 # Activate C++11
 if(NOT "${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 ")
+  ADD_DEFINITIONS(-std=c++11)
 endif()
 
 # Configuring other platform dependencies
@@ -261,9 +261,6 @@ target_link_libraries(OSRM ${STXXL_LIBRARY})
 target_link_libraries(osrm-extract ${STXXL_LIBRARY})
 target_link_libraries(osrm-prepare ${STXXL_LIBRARY})
 
-# check if we need to link against libgomp
-include(check_stxxl)
-
 if(MINGW)
   # STXXL needs OpenMP library
   target_link_libraries(osrm-extract gomp)
diff --git a/cmake/check_stxxl.cmake b/cmake/check_stxxl.cmake
deleted file mode 100644
index 7f399f0..0000000
--- a/cmake/check_stxxl.cmake
+++ /dev/null
@@ -1,24 +0,0 @@
-INCLUDE (CheckCXXSourceCompiles)
-unset(STXXL_WORKS CACHE)
-set (STXXL_CHECK_SRC "#include <stxxl/vector>\n int main() { stxxl::vector<int> vec; return 0;}")
-set (CMAKE_TRY_COMPILE_CONFIGURATION ${CMAKE_BUILD_TYPE})
-set (CMAKE_REQUIRED_INCLUDES "${STXXL_INCLUDE_DIR}")
-set (CMAKE_REQUIRED_LIBRARIES "${STXXL_LIBRARY}")
-
-CHECK_CXX_SOURCE_COMPILES("${STXXL_CHECK_SRC}" STXXL_WORKS)
-
-if(STXXL_WORKS)
-  message(STATUS "STXXL can be used without linking against libgomp")
-else()
-  message(STATUS "Linking STXXL failed without libgomp, retrying ..")
-  find_package(OpenMP)
-  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}${OpenMP_CXX_FLAGS}")
-  CHECK_CXX_SOURCE_COMPILES("${STXXL_CHECK_SRC}" STXXL_LINKS)
-
-  if (STXXL_LINKS)
-    message(STATUS "STXXL needs to link against OpenMP")
-    target_link_libraries(osrm-extract gomp)
-  else()
-    message(FATAL_ERROR "STXXL failed failed, libgomp missing?")
-  endif()
-endif()
diff --git a/debian/patches/fix-build b/debian/patches/fix-build
index 5d82773..3fd0d07 100644
--- a/debian/patches/fix-build
+++ b/debian/patches/fix-build
@@ -15,8 +15,8 @@ Description: fix build issue
    * New upstream release.
 Author: Christopher Baines <mail at cbaines.net>
 
---- osrm-4.5.0.orig/CMakeLists.txt
-+++ osrm-4.5.0/CMakeLists.txt
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
 @@ -172,7 +172,7 @@ endif()
  
  # Activate C++11
@@ -37,7 +37,7 @@ Author: Christopher Baines <mail at cbaines.net>
    # STXXL needs OpenMP library
    target_link_libraries(osrm-extract gomp)
 --- /dev/null
-+++ osrm-4.5.0/cmake/check_stxxl.cmake
++++ b/cmake/check_stxxl.cmake
 @@ -0,0 +1,24 @@
 +INCLUDE (CheckCXXSourceCompiles)
 +unset(STXXL_WORKS CACHE)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osrm.git