Merge branch 'master' of github.com:simgrid/simgrid

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

diff --git a/tools/cmake/Modules/FindLibunwind.cmake b/tools/cmake/Modules/FindLibunwind.cmake
index bce74ff..87adb1b 100644 (file)
--- a/tools/cmake/Modules/FindLibunwind.cmake
+++ b/tools/cmake/Modules/FindLibunwind.cmake
@@ -1,4 +1,4 @@
-if(PROCESSOR_x86_64)
+if(SIMGRID_PROCESSOR_x86_64)
   find_library(PATH_LIBUNWIND_LIB
     NAMES unwind-x86_64
     HINTS
@@ -18,25 +18,17 @@ 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/)
-      
-  # 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()
+    $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/)
 endif()
 
 find_path(PATH_LIBUNWIND_H "libunwind.h"