[Cmake-commits] CMake branch, next, updated. v3.1.0-rc2-820-gc3ae9da

Rolf Eike Beer eike at sf-mail.de
Mon Nov 24 16:16:07 EST 2014


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  c3ae9da0c6588de9abcbdaf5e12ada68f8e3c06f (commit)
       via  045f424da445eeda2ba392b68b2984cf08ce219a (commit)
      from  8a4a6907ea782b0ab399a1ec66ed212b44408b6a (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=c3ae9da0c6588de9abcbdaf5e12ada68f8e3c06f
commit c3ae9da0c6588de9abcbdaf5e12ada68f8e3c06f
Merge: 8a4a690 045f424
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Mon Nov 24 16:16:06 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Nov 24 16:16:06 2014 -0500

    Merge topic 'GetPrerequisites-expansion' into next
    
    045f424d GetPrerequisites: partially revert changes


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=045f424da445eeda2ba392b68b2984cf08ce219a
commit 045f424da445eeda2ba392b68b2984cf08ce219a
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Mon Nov 24 22:14:47 2014 +0100
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Mon Nov 24 22:14:47 2014 +0100

    GetPrerequisites: partially revert changes
    
    The ARGV[123] changes have some side effects, revert it until they get properly
    resolved.

diff --git a/Modules/GetPrerequisites.cmake b/Modules/GetPrerequisites.cmake
index 53edb00..712a41c 100644
--- a/Modules/GetPrerequisites.cmake
+++ b/Modules/GetPrerequisites.cmake
@@ -874,19 +874,19 @@ endfunction()
 
 
 function(list_prerequisites target)
-  if(NOT ARGV1)
+  if("${ARGV1}" STREQUAL "")
     set(all 1)
   else()
     set(all "${ARGV1}")
   endif()
 
-  if(NOT ARGV2)
+  if("${ARGV2}" STREQUAL "")
     set(exclude_system 0)
   else()
     set(exclude_system "${ARGV2}")
   endif()
 
-  if(NOT ARGV3)
+  if("${ARGV3}" STREQUAL "")
     set(verbose 0)
   else()
     set(verbose "${ARGV3}")

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

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


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list