From: degomme Date: Wed, 2 Nov 2016 13:39:31 +0000 (+0100) Subject: Revert "libunwind 32bits: don't search the lib in itself but in its directory" X-Git-Tag: v3_14~247 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/f966edc0a326b70299f726a8adf7b22f5d83c5d2?ds=sidebyside Revert "libunwind 32bits: don't search the lib in itself but in its directory" This reverts commit 103a2ff1188a796989e4ce99fec49f5744194b23. --- diff --git a/tools/cmake/Modules/FindLibunwind.cmake b/tools/cmake/Modules/FindLibunwind.cmake index 8e9be6de04..1a2dd8308e 100644 --- a/tools/cmake/Modules/FindLibunwind.cmake +++ b/tools/cmake/Modules/FindLibunwind.cmake @@ -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") - - string(REGEX REPLACE "/libunwind.*[.]${LIB_EXE}$" "" PATH_LIBUNWIND_LIB "${PATH_LIBUNWIND_LIB}") 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)