From: degomme Date: Wed, 2 Nov 2016 13:39:37 +0000 (+0100) Subject: Revert "cmake: better log message to get more useful information" X-Git-Tag: v3_14~245 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/5dd32633734c45f8697bab68eb972a2bb6a415a6?hp=3a80150d9935abde352266ec6090832db2d6d066 Revert "cmake: better log message to get more useful information" This reverts commit 438bc4767b28f0113c8f64d9d46ed4417988b6f7. --- diff --git a/tools/cmake/Modules/FindLibunwind.cmake b/tools/cmake/Modules/FindLibunwind.cmake index d940934da4..bce74ff8e6 100644 --- a/tools/cmake/Modules/FindLibunwind.cmake +++ b/tools/cmake/Modules/FindLibunwind.cmake @@ -1,5 +1,3 @@ -message(STATUS "Looking for libunwind") - if(PROCESSOR_x86_64) find_library(PATH_LIBUNWIND_LIB NAMES unwind-x86_64 @@ -14,7 +12,6 @@ if(PROCESSOR_x86_64) /opt/csw /sw /usr) - message(STATUS "Looking for libunwind-x86_64 - found") endif() if(NOT PATH_LIBUNWIND_LIB) @@ -35,17 +32,11 @@ 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") CHECK_LIBRARY_EXISTS(unwind unw_init_local PATH_LIBUNWIND_LIB RIGHT_LIBUNWIND) if (NOT RIGHT_LIBUNWIND) - message(STATUS "This libunwind does not contain unw_init_local(). It's unusable.") - set(PATH_LIBUNWIND_LIB 0) + unset(PATH_LIBUNWIND_LIB) endif() - - else() - message(STATUS "Looking for libunwind - not found") endif() - endif() find_path(PATH_LIBUNWIND_H "libunwind.h" @@ -68,6 +59,13 @@ 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") +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}")