From: Martin Quinson Date: Sat, 27 Jan 2018 05:28:59 +0000 (+0100) Subject: more informative outputs while searching for libunwind X-Git-Tag: v3.19~299 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/025e2b8a7f5a2d0e6f07f051ad08536c46f4b927?hp=4c4e598644034fc1cc7498d70dc0b42bd6c4e744;ds=sidebyside more informative outputs while searching for libunwind --- diff --git a/tools/cmake/Modules/FindLibunwind.cmake b/tools/cmake/Modules/FindLibunwind.cmake index 87adb1b994..68ad740f82 100644 --- a/tools/cmake/Modules/FindLibunwind.cmake +++ b/tools/cmake/Modules/FindLibunwind.cmake @@ -44,26 +44,23 @@ find_path(PATH_LIBUNWIND_H "libunwind.h" /sw /usr) -message(STATUS "Looking for libunwind.h") if(PATH_LIBUNWIND_H) - message(STATUS "Looking for libunwind.h - found") + string(REGEX REPLACE "/libunwind.h" "" PATH_LIBUNWIND_H "${PATH_LIBUNWIND_H}") + message(STATUS "Looking for libunwind.h - found in ${PATH_LIBUNWIND_H}") + include_directories(${PATH_LIBUNWIND_H}) else() message(STATUS "Looking for libunwind.h - not found") endif() -message(STATUS "Looking for libunwind") if(PATH_LIBUNWIND_LIB) - message(STATUS "Looking for libunwind - found") + string(REGEX REPLACE "/libunwind.*[.]${LIB_EXE}$" "" PATH_LIBUNWIND_LIB "${PATH_LIBUNWIND_LIB}") + message(STATUS "Looking for libunwind.${LIB_EXE} - found in ${PATH_LIBUNWIND_LIB}") + link_directories(${PATH_LIBUNWIND_LIB}) else() message(STATUS "Looking for libunwind - not found") endif() if(PATH_LIBUNWIND_LIB AND PATH_LIBUNWIND_H) - string(REGEX REPLACE "/libunwind.*[.]${LIB_EXE}$" "" PATH_LIBUNWIND_LIB "${PATH_LIBUNWIND_LIB}") - string(REGEX REPLACE "/libunwind.h" "" PATH_LIBUNWIND_H "${PATH_LIBUNWIND_H}") - - include_directories(${PATH_LIBUNWIND_H}) - link_directories(${PATH_LIBUNWIND_LIB}) SET(HAVE_LIBUNWIND 1) else() SET(HAVE_LIBUNWIND 0)