Fix MC builds after my fix for Mac OSX around libunwind :-(

[simgrid.git] / tools / cmake / Modules / FindLibunwind.cmake

diff --git a/tools/cmake/Modules/FindLibunwind.cmake b/tools/cmake/Modules/FindLibunwind.cmake
index 70f3ecf8788e40df97766c398b827aba8509f8f4..bce74ff8e6059ad4865c01c7bf44226c87bb964a 100644 (file)
--- a/tools/cmake/Modules/FindLibunwind.cmake
+++ b/tools/cmake/Modules/FindLibunwind.cmake
@@ -18,17 +18,25 @@ if(NOT PATH_LIBUNWIND_LIB)
   find_library(PATH_LIBUNWIND_LIB
     NAMES unwind
     HINTS
-    $ENV{SIMGRID_LIBUNWIND_LIBRARY_PATH}
-    $ENV{LD_LIBRARY_PATH}
-    $ENV{LIBUNWIND_LIBRARY_PATH}
-    PATH_SUFFIXES lib/ GnuWin32/lib lib/system
-    PATHS
-    /opt
-    /opt/local
-    /opt/csw
-    /sw
-    /usr
-    /usr/lib/)
+      $ENV{SIMGRID_LIBUNWIND_LIBRARY_PATH}
+      $ENV{LD_LIBRARY_PATH}
+      $ENV{LIBUNWIND_LIBRARY_PATH}
+      PATH_SUFFIXES lib/ GnuWin32/lib lib/system
+      PATHS
+      /opt
+      /opt/local
+      /opt/csw
+      /sw
+      /usr
+      /usr/lib/)
+      
+  # Mac OSX has a libunwind that is not the one we need, so double check
+  if (PATH_LIBUNWIND_LIB)
+    CHECK_LIBRARY_EXISTS(unwind unw_init_local PATH_LIBUNWIND_LIB RIGHT_LIBUNWIND)
+    if (NOT RIGHT_LIBUNWIND)
+      unset(PATH_LIBUNWIND_LIB)
+    endif()
+  endif()
 endif()
 
 find_path(PATH_LIBUNWIND_H "libunwind.h"
@@ -64,8 +72,9 @@ if(PATH_LIBUNWIND_LIB AND PATH_LIBUNWIND_H)
       
   include_directories(${PATH_LIBUNWIND_H})
   link_directories(${PATH_LIBUNWIND_LIB})
+  SET(HAVE_LIBUNWIND 1)
 else()
-  message(FATAL_ERROR "Please either install the libunwind7-dev package (or equivalent) or turn off the model-checking option of SimGrid.")
+  SET(HAVE_LIBUNWIND 0)
 endif()
 
 mark_as_advanced(PATH_LIBDW_H)