From 438bc4767b28f0113c8f64d9d46ed4417988b6f7 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Tue, 1 Nov 2016 21:19:11 +0100 Subject: [PATCH] cmake: better log message to get more useful information --- tools/cmake/Modules/FindLibunwind.cmake | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/tools/cmake/Modules/FindLibunwind.cmake b/tools/cmake/Modules/FindLibunwind.cmake index bce74ff8e6..d940934da4 100644 --- a/tools/cmake/Modules/FindLibunwind.cmake +++ b/tools/cmake/Modules/FindLibunwind.cmake @@ -1,3 +1,5 @@ +message(STATUS "Looking for libunwind") + if(PROCESSOR_x86_64) find_library(PATH_LIBUNWIND_LIB NAMES unwind-x86_64 @@ -12,6 +14,7 @@ if(PROCESSOR_x86_64) /opt/csw /sw /usr) + message(STATUS "Looking for libunwind-x86_64 - found") endif() if(NOT PATH_LIBUNWIND_LIB) @@ -32,11 +35,17 @@ 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) - unset(PATH_LIBUNWIND_LIB) + message(STATUS "This libunwind does not contain unw_init_local(). It's unusable.") + set(PATH_LIBUNWIND_LIB 0) endif() + + else() + message(STATUS "Looking for libunwind - not found") endif() + endif() find_path(PATH_LIBUNWIND_H "libunwind.h" @@ -59,13 +68,6 @@ 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}") -- 2.20.1