summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-12-03 14:17:34 (GMT)
committerBrad King <brad.king@kitware.com>2015-12-03 14:17:34 (GMT)
commit5914d5eabc8f050f9b1c9873d31598331eaeefa7 (patch)
treeee41efc5328890e49e397df5f12016683789cb4f
parentfd7180f0c0c2554c31afda235469df986a109fe4 (diff)
parentd8b251e2ea84e612dc30a1c9690a8b299aeb30fd (diff)
downloadCMake-5914d5eabc8f050f9b1c9873d31598331eaeefa7.zip
CMake-5914d5eabc8f050f9b1c9873d31598331eaeefa7.tar.gz
CMake-5914d5eabc8f050f9b1c9873d31598331eaeefa7.tar.bz2
Merge branch 'fix-java-idlj-jarsigner-typos' into release
-rw-r--r--Modules/FindJava.cmake6
1 files changed, 3 insertions, 3 deletions
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()