[Cmake-commits] CMake branch, next, updated. v2.8.12.1-6265-g5fcc882

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  5fcc882aadb2e99eb730f619633b2c5af68b91fd (commit)
       via  9650c09b952598e39b67962411900ef6303d4117 (commit)
      from  4072686e2811af5d197b015b04d3e86f25543ac8 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5fcc882aadb2e99eb730f619633b2c5af68b91fd
commit 5fcc882aadb2e99eb730f619633b2c5af68b91fd
Merge: 4072686 9650c09
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Dec 19 10:22:14 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Dec 19 10:22:14 2013 -0500

    Merge topic 'find_backtrace' into next
    
    9650c09 FindBacktrace: Search and report only when not already found


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9650c09b952598e39b67962411900ef6303d4117
commit 9650c09b952598e39b67962411900ef6303d4117
Author:     Vadim Zhukov <persgray at gmail.com>
AuthorDate: Tue Dec 10 15:05:02 2013 +0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Dec 19 10:22:04 2013 -0500

    FindBacktrace: Search and report only when not already found
    
    Avoid saying "... detected in default set..." each time CMake is run.
    
    Prompted by Rolf Eike Beer on cmake-developers at .

diff --git a/Modules/FindBacktrace.cmake b/Modules/FindBacktrace.cmake
index 56e739e..83789cc 100644
--- a/Modules/FindBacktrace.cmake
+++ b/Modules/FindBacktrace.cmake
@@ -58,17 +58,20 @@ endif(Backtrace_HEADER)
 find_path(Backtrace_INCLUDE_DIR "${_Backtrace_HEADER_TRY}")
 set(Backtrace_INCLUDE_DIRS ${Backtrace_INCLUDE_DIR})
 
-# First, check if we already have backtrace(), e.g., in libc
-cmake_push_check_state(RESET)
-set(CMAKE_REQUIRED_INCLUDES ${Backtrace_INCLUDE_DIRS})
-check_symbol_exists("backtrace" "${_Backtrace_HEADER_TRY}" _Backtrace_SYM_FOUND)
-cmake_pop_check_state()
+if (NOT DEFINED Backtrace_LIBRARY)
+  # First, check if we already have backtrace(), e.g., in libc
+  cmake_push_check_state(RESET)
+  set(CMAKE_REQUIRED_INCLUDES ${Backtrace_INCLUDE_DIRS})
+  check_symbol_exists("backtrace" "${_Backtrace_HEADER_TRY}" _Backtrace_SYM_FOUND)
+  cmake_pop_check_state()
+endif()
 
 if(_Backtrace_SYM_FOUND)
-  set(Backtrace_LIBRARY)
-  if(NOT Backtrace_FIND_QUIETLY)
+  # Avoid repeating the message() call below each time CMake is run.
+  if(NOT Backtrace_FIND_QUIETLY AND NOT DEFINED Backtrace_LIBRARY)
     message(STATUS "backtrace facility detected in default set of libraries")
   endif()
+  set(Backtrace_LIBRARY "" CACHE FILEPATH "Library providing backtrace(3), empty for default set of libraries")
 else()
   # Check for external library, for non-glibc systems
   if(Backtrace_INCLUDE_DIR)

-----------------------------------------------------------------------

Summary of changes:
 Modules/FindBacktrace.cmake |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
CMake