diff options
| author | Brad King <brad.king@kitware.com> | 2018-04-25 13:19:35 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-04-25 13:19:35 (GMT) |
| commit | ea54a9c6669c7f9fdec56238db6a57d371f56868 (patch) | |
| tree | d5eecd7ceecbf9a907ea911d9529424f1bd6a756 /Modules/UseJava.cmake | |
| parent | 83e3b1497d4889f8dbb7238a270296377035e40b (diff) | |
| parent | 5482f485b8c3114d258c4cd1a379a6cd12921cb1 (diff) | |
| download | CMake-ea54a9c6669c7f9fdec56238db6a57d371f56868.zip CMake-ea54a9c6669c7f9fdec56238db6a57d371f56868.tar.gz CMake-ea54a9c6669c7f9fdec56238db6a57d371f56868.tar.bz2 | |
Merge branch 'backport-java-new-packaging' into java-new-packaging
Fix conflicts by combining the changes from both sides.
Diffstat (limited to 'Modules/UseJava.cmake')
| -rw-r--r-- | Modules/UseJava.cmake | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Modules/UseJava.cmake b/Modules/UseJava.cmake index 7b138f5..6e2c511 100644 --- a/Modules/UseJava.cmake +++ b/Modules/UseJava.cmake @@ -384,7 +384,7 @@ # Create C header files from java classes. These files provide the connective glue # that allow your Java and C code to interact. # -# This command will no longer be supported starting with version 1.10 of the JDK due +# This command will no longer be supported starting with version 10 of the JDK due # to the `suppression of javah tool <http://openjdk.java.net/jeps/313>`_. # Command ``add_jar(GENERATE_NATIVE_HEADERS)`` must be used instead. # @@ -527,7 +527,7 @@ function(add_jar _TARGET_NAME) if (_add_jar_GENERATE_NATIVE_HEADERS) # Raise an error if JDK version is less than 1.8 because javac -h is not supported # by earlier versions. - if ("${Java_VERSION}" VERSION_LESS 1.8) + if (Java_VERSION VERSION_LESS 1.8) message (FATAL_ERROR "ADD_JAR: GENERATE_NATIVE_HEADERS is not supported with this version of Java.") endif() cmake_parse_arguments (_add_jar_GENERATE_NATIVE_HEADERS "" "DESTINATION" "" ${_add_jar_GENERATE_NATIVE_HEADERS}) @@ -1312,10 +1312,10 @@ function(create_javadoc _target) endfunction() function (create_javah) - if ("${Java_VERSION}" VERSION_GREATER_EQUAL 1.10) + if (Java_VERSION VERSION_GREATER_EQUAL 10) message (FATAL_ERROR "create_javah: not supported with this Java version. Use add_jar(GENERATE_NATIVE_HEADERS) instead.") - elseif ("${Java_VERSION}" VERSION_GREATER_EQUAL 1.8) - message (DEPRECATION "create_javah: this command will no longer be supported starting with version 1.10 of JDK. Update your project by using command add_jar(GENERATE_NATIVE_HEADERS) instead.") + elseif (Java_VERSION VERSION_GREATER_EQUAL 1.8) + message (DEPRECATION "create_javah: this command will no longer be supported starting with version 10 of JDK. Update your project by using command add_jar(GENERATE_NATIVE_HEADERS) instead.") endif() cmake_parse_arguments(_create_javah |