[Cmake-commits] CMake branch, next, updated. v3.4.1-1568-g103203b

[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  103203b3b0b83c73476f82a2e1bd29bb272a53c6 (commit)
       via  d8b251e2ea84e612dc30a1c9690a8b299aeb30fd (commit)
      from  b0cc082ad6c6619653afbceca0ac2888d944e9e2 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=103203b3b0b83c73476f82a2e1bd29bb272a53c6
commit 103203b3b0b83c73476f82a2e1bd29bb272a53c6
Merge: b0cc082 d8b251e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Dec 3 09:17:56 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Dec 3 09:17:56 2015 -0500

    Merge topic 'fix-java-idlj-jarsigner-typos' into next
    
    d8b251e2 FindJava: Fix typos in IdlJ and JarSigner component implementation


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d8b251e2ea84e612dc30a1c9690a8b299aeb30fd
commit d8b251e2ea84e612dc30a1c9690a8b299aeb30fd
Author:     Marc Chevrier <marc.chevrier at sap.com>
AuthorDate: Thu Dec 3 12:34:51 2015 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Dec 3 09:17:00 2015 -0500

    FindJava: Fix typos in IdlJ and JarSigner component implementation
    
    Fix typos introduced by commit v3.4.0-rc1~257^2~2 (FindJava: Add support
    for idlj and jarsigner tools, 2015-07-31) to correctly report when these
    components are found.

diff --git a/Modules/FindJava.cmake b/Modules/FindJava.cmake
index 9f87997..cc67df6 100644
--- a/Modules/FindJava.cmake
+++ b/Modules/FindJava.cmake
@@ -228,12 +228,12 @@ if(Java_FIND_COMPONENTS)
       endif()
     elseif(component STREQUAL "IdlJ")
       list(APPEND _JAVA_REQUIRED_VARS Java_IDLJ_EXECUTABLE)
-      if(Java_IdlJ_EXECUTABLE)
-        set(Java_Extra_FOUND TRUE)
+      if(Java_IDLJ_EXECUTABLE)
+        set(Java_IdlJ_FOUND TRUE)
       endif()
     elseif(component STREQUAL "JarSigner")
       list(APPEND _JAVA_REQUIRED_VARS Java_JARSIGNER_EXECUTABLE)
-      if(Java_IDLJ_EXECUTABLE)
+      if(Java_JARSIGNER_EXECUTABLE)
         set(Java_JarSigner_FOUND TRUE)
       endif()
     else()

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

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


hooks/post-receive
-- 
CMake