[Cmake-commits] CMake branch, next, updated. v2.8.8-3072-g7e1031a

Rolf Eike Beer eike at sf-mail.de
Fri Jun 8 11:28:45 EDT 2012


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  7e1031acd235b208c1bc6ddde96e3be2a4061d07 (commit)
       via  632946338b7c14ed4354159b28a68f5edff43b12 (commit)
       via  03deea00bc55210f2de47805d2abbe7110efac38 (commit)
       via  5ed6a36cc93692ce1e5debea22d61bfd5dbfbbc6 (commit)
      from  9e0172b255ba5fe3d1d39248da428f70ee4b2cd5 (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=7e1031acd235b208c1bc6ddde96e3be2a4061d07
commit 7e1031acd235b208c1bc6ddde96e3be2a4061d07
Merge: 9e0172b 6329463
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Fri Jun 8 11:28:43 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jun 8 11:28:43 2012 -0400

    Merge topic 'UseJava-13281' into next
    
    6329463 UseJava: fix find_jar() called with multiple files (#13281)
    03deea0 CMake Nightly Date Stamp
    5ed6a36 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=632946338b7c14ed4354159b28a68f5edff43b12
commit 632946338b7c14ed4354159b28a68f5edff43b12
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Fri Jun 8 17:22:43 2012 +0200
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Fri Jun 8 17:22:43 2012 +0200

    UseJava: fix find_jar() called with multiple files (#13281)

diff --git a/Modules/UseJava.cmake b/Modules/UseJava.cmake
index 30cc920..39e79fc 100644
--- a/Modules/UseJava.cmake
+++ b/Modules/UseJava.cmake
@@ -533,9 +533,9 @@ function (find_jar VARIABLE)
         endif (${_state} STREQUAL "name")
     endforeach (arg ${ARGN})
 
-    if (${_jar_names} STREQUAL "")
+    if (_jar_names STREQUAL "")
         message(FATAL_ERROR "find_jar: No name to search for given")
-    endif (${_jar_names} STREQUAL "")
+    endif (_jar_names STREQUAL "")
 
     foreach (jar_name ${_jar_names})
         foreach (version ${_jar_versions})

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

Summary of changes:
 Modules/UseJava.cmake     |    4 ++--
 Source/CMakeVersion.cmake |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list