Fix dynamic/static detection

Project-OSRM · Jan 21, 2016 · bf061e6 · bf061e6
1 parent 05dede3
commit bf061e6
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 31 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -136,6 +136,10 @@ script:
   - make tests --jobs=2
   - make benchmarks
   - sudo make install
+  - |
+    if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then
+      sudo ldconfig
+    fi
   - ./extractor-tests
   - ./engine-tests
   - ./util-tests

diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt
@@ -28,6 +28,6 @@ add_executable(osrm-example example.cpp)
 find_package(LibOSRM REQUIRED)
 find_package(Boost 1.49.0 COMPONENTS filesystem system thread REQUIRED)
 
-target_link_libraries(osrm-example ${LibOSRM_LIBRARIES})
+target_link_libraries(osrm-example ${LibOSRM_LIBRARIES} ${Boost_LIBRARIES})
 include_directories(SYSTEM ${LibOSRM_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS})
 
diff --git a/example/cmake/FindLibOSRM.cmake b/example/cmake/FindLibOSRM.cmake
@@ -18,42 +18,44 @@ find_path(LibOSRM_INCLUDE_DIR osrm/osrm.hpp
   /usr
   /opt/local
   /opt)
+
 set(LibOSRM_INCLUDE_DIRS ${LibOSRM_INCLUDE_DIR})
 
-if ("${PC_LibOSRM_STATIC_LIBRARIES}" STREQUAL "")
-  find_library(LibOSRM_STATIC_LIBRARY Names osrm.lib libosrm.a
-    PATH_SUFFIXES osrm lib/osrm lib
-    HINTS ${PC_LibOSRM_LIBDIR} ${PC_LibOSRM_LIBRARY_DIRS}
-    ~/Library/Frameworks
-    /Library/Frameworks
-    /usr/local
-    /usr
-    /opt/local
-    /opt)
-  set(LibOSRM_STATIC_LIBRARIES ${LibOSRM_STATIC_LIBRARY})
-else()
-  set(LibOSRM_STATIC_LIBRARIES ${PC_LibOSRM_STATIC_LIBRARIES})
-endif()
+find_library(TEST_LibOSRM_STATIC_LIBRARY Names osrm.lib libosrm.a
+  PATH_SUFFIXES osrm lib/osrm lib
+  HINTS ${PC_LibOSRM_LIBDIR} ${PC_LibOSRM_LIBRARY_DIRS}
+  ~/Library/Frameworks
+  /Library/Frameworks
+  /usr/local
+  /usr
+  /opt/local
+  /opt)
+find_library(TEST_LibOSRM_DYNAMIC_LIBRARY Names osrm.dynlib libosrm.so
+  PATH_SUFFIXES osrm lib/osrm lib
+  HINTS ${PC_LibOSRM_LIBDIR} ${PC_LibOSRM_LIBRARY_DIRS}
+  ~/Library/Frameworks
+  /Library/Frameworks
+  /usr/local
+  /usr
+  /opt/local
+  /opt)
 
-if ("${PC_LibOSRM_LIBRARIES}" STREQUAL "")
-  find_library(LibOSRM_DYNAMIC_LIBRARY Names osrm.dynlib libosrm.so
-    PATH_SUFFIXES osrm lib/osrm lib
-    HINTS ${PC_LibOSRM_LIBDIR} ${PC_LibOSRM_LIBRARY_DIRS}
-    ~/Library/Frameworks
-    /Library/Frameworks
-    /usr/local
-    /usr
-    /opt/local
-    /opt)
-  set(LibOSRM_DYNAMIC_LIBRARIES ${LibOSRM_DYNAMIC_LIBRARY})
-else()
-  set(LibOSRM_DYNAMIC_LIBRARIES ${PC_LibOSRM_LIBRARIES})
+if (NOT ("${TEST_LibOSRM_STATIC_LIBRARY}" STREQUAL "TEST_LibOSRM_STATIC_LIBRARY-NOTFOUND"))
+  if ("${PC_LibOSRM_STATIC_LIBRARIES}" STREQUAL "")
+    set(LibOSRM_STATIC_LIBRARIES ${TEST_LibOSRM_STATIC_LIBRARY})
+  else()
+    set(LibOSRM_STATIC_LIBRARIES ${PC_LibOSRM_STATIC_LIBRARIES})
+  endif()
+  set(LibOSRM_LIBRARIES ${LibOSRM_STATIC_LIBRARIES})
 endif()
 
-if ("${LibOSRM_STATIC_LIBRARIES}" STREQUAL "")
+if (NOT ("${TEST_LibOSRM_DYNAMIC_LIBRARY}" STREQUAL "TEST_LibOSRM_DYNAMIC_LIBRARY-NOTFOUND"))
+  if ("${PC_LibOSRM_LIBRARIES}" STREQUAL "")
+    set(LibOSRM_DYNAMIC_LIBRARIES ${TEST_LibOSRM_DYNAMIC_LIBRARY})
+  else()
+    set(LibOSRM_DYNAMIC_LIBRARIES ${PC_LibOSRM_LIBRARIES})
+  endif()
   set(LibOSRM_LIBRARIES ${LibOSRM_DYNAMIC_LIBRARIES})
-else()
-  set(LibOSRM_LIBRARIES ${LibOSRM_STATIC_LIBRARIES})
 endif()
 
 include(FindPackageHandleStandardArgs)