Fix dynamic/static detection

Project-OSRM · Jan 21, 2016 · 0e3d9d2 · 0e3d9d2
1 parent 05dede3
commit 0e3d9d2
Showing 1 changed file with 38 additions and 29 deletions.
diff --git a/example/cmake/FindLibOSRM.cmake b/example/cmake/FindLibOSRM.cmake
@@ -18,42 +18,51 @@ 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})
+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)
+
+SET(LibOSRM_FOUND_STATIC NOT "${TEST_LibOSRM_STATIC_LIBRARY}" STREQUAL "")
+SET(LibOSRM_FOUND_DYNAMIC NOT "${TEST_LibOSRM_DYNAMIC_LIBRARY}" STREQUAL "")
+
+if (LibOSRM_FOUND_STATIC)
+  if ("${PC_LibOSRM_STATIC_LIBRARIES}" STREQUAL "")
+    set(LibOSRM_STATIC_LIBRARIES ${TEST_LibOSRM_STATIC_LIBRARY})
+  else()
+    set(LibOSRM_STATIC_LIBRARIES ${PC_LibOSRM_STATIC_LIBRARIES})
+  endif()
 endif()
 
-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 (LibOSRM_FOUND_DYNAMIC)
+  if ("${PC_LibOSRM_LIBRARIES}" STREQUAL "")
+    set(LibOSRM_DYNAMIC_LIBRARIES ${TEST_LibOSRM_DYNAMIC_LIBRARY})
+  else()
+    set(LibOSRM_DYNAMIC_LIBRARIES ${PC_LibOSRM_LIBRARIES})
+  endif()
 endif()
 
-if ("${LibOSRM_STATIC_LIBRARIES}" STREQUAL "")
-  set(LibOSRM_LIBRARIES ${LibOSRM_DYNAMIC_LIBRARIES})
-else()
+if (LibOSRM_FOUND_STATIC)
   set(LibOSRM_LIBRARIES ${LibOSRM_STATIC_LIBRARIES})
+elseif(LibOSRM_FOUND_DYNAMIC)
+  set(LibOSRM_LIBRARIES ${LibOSRM_DYNAMIC_LIBRARIES})
 endif()
 
 include(FindPackageHandleStandardArgs)