Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
libunwind 32bits: don't search the lib in itself but in its directory
authorMartin Quinson <martin.quinson@loria.fr>
Tue, 1 Nov 2016 21:10:45 +0000 (22:10 +0100)
committerMartin Quinson <martin.quinson@loria.fr>
Tue, 1 Nov 2016 21:10:45 +0000 (22:10 +0100)
tools/cmake/Modules/FindLibunwind.cmake

index 1a2dd83..8e9be6d 100644 (file)
@@ -36,7 +36,10 @@ if(NOT PATH_LIBUNWIND_LIB)
   # Mac OSX has a libunwind that is not the one we need, so double check
   if (PATH_LIBUNWIND_LIB)
     message(STATUS "Looking for libunwind - found")
   # Mac OSX has a libunwind that is not the one we need, so double check
   if (PATH_LIBUNWIND_LIB)
     message(STATUS "Looking for libunwind - found")
+
+    string(REGEX REPLACE "/libunwind.*[.]${LIB_EXE}$" "" PATH_LIBUNWIND_LIB "${PATH_LIBUNWIND_LIB}")
     CHECK_LIBRARY_EXISTS(unwind unw_init_local "${PATH_LIBUNWIND_LIB}" RIGHT_LIBUNWIND)
     CHECK_LIBRARY_EXISTS(unwind unw_init_local "${PATH_LIBUNWIND_LIB}" RIGHT_LIBUNWIND)
+
     if (NOT RIGHT_LIBUNWIND)
       message(STATUS "libunwind in ${PATH_LIBUNWIND_LIB} is unusable. Disable it.")
       set(PATH_LIBUNWIND_LIB 0)
     if (NOT RIGHT_LIBUNWIND)
       message(STATUS "libunwind in ${PATH_LIBUNWIND_LIB} is unusable. Disable it.")
       set(PATH_LIBUNWIND_LIB 0)