Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Revert "libunwind 32bits: don't search the lib in itself but in its directory"
authordegomme <augustin.degomme@unibas.ch>
Wed, 2 Nov 2016 13:39:31 +0000 (14:39 +0100)
committerdegomme <augustin.degomme@unibas.ch>
Wed, 2 Nov 2016 13:39:31 +0000 (14:39 +0100)
This reverts commit 103a2ff1188a796989e4ce99fec49f5744194b23.

tools/cmake/Modules/FindLibunwind.cmake

index 8e9be6d..1a2dd83 100644 (file)
@@ -36,10 +36,7 @@ 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)