[Cmake-commits] CMake branch, next, updated. v3.1.0-rc2-719-g1c8cbcf

[Rolf Eike Beer]

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  1c8cbcfad84ae237c0c149d1b5e0a4db5d7547c8 (commit)
       via  2a2632293cda2e1b7b8bda64b7d79d36e08b032c (commit)
      from  9147af1821cb5017db1230e2eda38ffc42ccdd83 (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=1c8cbcfad84ae237c0c149d1b5e0a4db5d7547c8
commit 1c8cbcfad84ae237c0c149d1b5e0a4db5d7547c8
Merge: 9147af1 2a26322
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Tue Nov 18 14:39:48 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Nov 18 14:39:48 2014 -0500

    Merge topic 'GetPrerequisites-expansion' into next
    
    2a263229 GetPrerequisites: join if() clauses


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2a2632293cda2e1b7b8bda64b7d79d36e08b032c
commit 2a2632293cda2e1b7b8bda64b7d79d36e08b032c
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Tue Nov 18 20:37:33 2014 +0100
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Tue Nov 18 20:39:16 2014 +0100

    GetPrerequisites: join if() clauses
    
    These all test the same variable for different values, so only one of them can
    ever be true. This also allows to completely remove one variable that only
    flagged if one of the conditions matched.

diff --git a/Modules/GetPrerequisites.cmake b/Modules/GetPrerequisites.cmake
index fa84df4..53edb00 100644
--- a/Modules/GetPrerequisites.cmake
+++ b/Modules/GetPrerequisites.cmake
@@ -666,45 +666,31 @@ function(get_prerequisites target prerequisites_var exclude_system recurse exepa
     return()
   endif()
 
-  set(gp_tool_known 0)
-
   if(gp_tool STREQUAL "ldd")
     set(gp_cmd_args "")
     set(gp_regex "^[\t ]*[^\t ]+ => ([^\t\(]+) .*${eol_char}$")
     set(gp_regex_error "not found${eol_char}$")
     set(gp_regex_fallback "^[\t ]*([^\t ]+) => ([^\t ]+).*${eol_char}$")
     set(gp_regex_cmp_count 1)
-    set(gp_tool_known 1)
-  endif()
-
-  if(gp_tool STREQUAL "otool")
+  elseif(gp_tool STREQUAL "otool")
     set(gp_cmd_args "-L")
     set(gp_regex "^\t([^\t]+) \\(compatibility version ([0-9]+.[0-9]+.[0-9]+), current version ([0-9]+.[0-9]+.[0-9]+)\\)${eol_char}$")
     set(gp_regex_error "")
     set(gp_regex_fallback "")
     set(gp_regex_cmp_count 3)
-    set(gp_tool_known 1)
-  endif()
-
-  if(gp_tool STREQUAL "dumpbin")
+  elseif(gp_tool STREQUAL "dumpbin")
     set(gp_cmd_args "/dependents")
     set(gp_regex "^    ([^ ].*[Dd][Ll][Ll])${eol_char}$")
     set(gp_regex_error "")
     set(gp_regex_fallback "")
     set(gp_regex_cmp_count 1)
-    set(gp_tool_known 1)
-  endif()
-
-  if(gp_tool STREQUAL "objdump")
+  elseif(gp_tool STREQUAL "objdump")
     set(gp_cmd_args "-p")
     set(gp_regex "^\t*DLL Name: (.*\\.[Dd][Ll][Ll])${eol_char}$")
     set(gp_regex_error "")
     set(gp_regex_fallback "")
     set(gp_regex_cmp_count 1)
-    set(gp_tool_known 1)
-  endif()
-
-  if(NOT gp_tool_known)
+  else()
     message(STATUS "warning: gp_tool='${gp_tool}' is an unknown tool...")
     message(STATUS "CMake function get_prerequisites needs more code to handle '${gp_tool}'")
     message(STATUS "Valid gp_tool values are dumpbin, ldd, objdump and otool.")

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

Summary of changes:
 Modules/GetPrerequisites.cmake |   22 ++++------------------
 1 file changed, 4 insertions(+), 18 deletions(-)


hooks/post-receive
-- 
CMake