mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-17 20:50:43 -06:00
Code Issues Packages Projects Releases Wiki Activity

FindJava: ignore javah for JDK 10, it has been removed

Browse Source 
The standalone javah tool has been removed, header generation happens
during execution of javac.  `javac -h` allows generation of headers
only.  See http://openjdk.java.net/projects/jdk/10/ and
http://openjdk.java.net/jeps/313 for details.

Fixes: #17613
This commit is contained in:
Stefan Brüns
2018-01-08 13:45:37 +01:00
committed by Brad King
parent 2c089d80de
commit 3c08d2075f
1 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
Modules/FindJava.cmake
View File

@@ -237,10 +237,18 @@ if(Java_FIND_COMPONENTS)
endif() endif()
elseif(component STREQUAL "Development") elseif(component STREQUAL "Development")
list(APPEND _JAVA_REQUIRED_VARS Java_JAVA_EXECUTABLE Java_JAVAC_EXECUTABLE list(APPEND _JAVA_REQUIRED_VARS Java_JAVA_EXECUTABLE Java_JAVAC_EXECUTABLE
Java_JAVAH_EXECUTABLE Java_JAVADOC_EXECUTABLE) Java_JAVADOC_EXECUTABLE)
if(Java_JAVA_EXECUTABLE AND Java_JAVAC_EXECUTABLE if(Java_VERSION VERSION_LESS "1.10")
AND Java_JAVAH_EXECUTABLE AND Java_JAVADOC_EXECUTABLE) list(APPEND _JAVA_REQUIRED_VARS Java_JAVAH_EXECUTABLE)
set(Java_Development_FOUND TRUE) if(Java_JAVA_EXECUTABLE AND Java_JAVAC_EXECUTABLE
AND Java_JAVAH_EXECUTABLE AND Java_JAVADOC_EXECUTABLE)
set(Java_Development_FOUND TRUE)
endif()
else()
if(Java_JAVA_EXECUTABLE AND Java_JAVAC_EXECUTABLE
AND Java_JAVADOC_EXECUTABLE)
set(Java_Development_FOUND TRUE)
endif()
endif() endif()
elseif(component STREQUAL "IdlJ") elseif(component STREQUAL "IdlJ")
list(APPEND _JAVA_REQUIRED_VARS Java_IDLJ_EXECUTABLE) list(APPEND _JAVA_REQUIRED_VARS Java_IDLJ_EXECUTABLE)
@@ -268,11 +276,19 @@ if(Java_FIND_COMPONENTS)
endif() endif()
else() else()
# Check for Development # Check for Development
find_package_handle_standard_args(Java if(Java_VERSION VERSION_LESS "1.10")
REQUIRED_VARS Java_JAVA_EXECUTABLE Java_JAR_EXECUTABLE Java_JAVAC_EXECUTABLE find_package_handle_standard_args(Java
Java_JAVAH_EXECUTABLE Java_JAVADOC_EXECUTABLE REQUIRED_VARS Java_JAVA_EXECUTABLE Java_JAR_EXECUTABLE Java_JAVAC_EXECUTABLE
VERSION_VAR Java_VERSION_STRING Java_JAVAH_EXECUTABLE Java_JAVADOC_EXECUTABLE
) VERSION_VAR Java_VERSION_STRING
)
else()
find_package_handle_standard_args(Java
REQUIRED_VARS Java_JAVA_EXECUTABLE Java_JAR_EXECUTABLE Java_JAVAC_EXECUTABLE
Java_JAVADOC_EXECUTABLE
VERSION_VAR Java_VERSION_STRING
)
endif()
endif() endif()