Merge pull request #17 from mpoquet/master

[simgrid.git] / buildtools / Cmake / Modules / FindLibunwind.cmake

diff --git a/buildtools/Cmake/Modules/FindLibunwind.cmake b/buildtools/Cmake/Modules/FindLibunwind.cmake
index 03bbed9..aadb692 100644 (file)
--- a/buildtools/Cmake/Modules/FindLibunwind.cmake
+++ b/buildtools/Cmake/Modules/FindLibunwind.cmake
@@ -5,27 +5,30 @@ if(PROCESSOR_x86_64)
     $ENV{SIMGRID_LIBUNWIND_LIBRARY_PATH}
     $ENV{LD_LIBRARY_PATH}
     $ENV{LIBUNWIND_LIBRARY_PATH}
-    PATH_SUFFIXES lib/ GnuWin32/lib
+    PATH_SUFFIXES lib/ GnuWin32/lib lib/system
     PATHS
     /opt
     /opt/local
     /opt/csw
     /sw
     /usr)
-else()
+endif()
+
+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
+    PATH_SUFFIXES lib/ GnuWin32/lib lib/system
     PATHS
     /opt
     /opt/local
     /opt/csw
     /sw
-    /usr)
+    /usr
+    /usr/lib/)
 endif()
 
 find_path(PATH_LIBUNWIND_H "libunwind.h"