From dc6b2d1b449a4abfd50e7e0281ae7676b34cb8c0 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Tue, 12 Feb 2013 23:26:55 +0100 Subject: [PATCH] Set cmake_minimum_version for the Java bindings. UseJava.cmake don't exist before cmake 2.8.6. --- buildtools/Cmake/CompleteInFiles.cmake | 1 - buildtools/Cmake/MakeJava.cmake | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/buildtools/Cmake/CompleteInFiles.cmake b/buildtools/Cmake/CompleteInFiles.cmake index b33553ed5b..771e21c925 100644 --- a/buildtools/Cmake/CompleteInFiles.cmake +++ b/buildtools/Cmake/CompleteInFiles.cmake @@ -85,7 +85,6 @@ endif() if(enable_java) find_package(Java REQUIRED COMPONENTS Runtime Development) find_package(JNI REQUIRED) - include(UseJava) set(HAVE_Java 1) endif() if(enable_lua) diff --git a/buildtools/Cmake/MakeJava.cmake b/buildtools/Cmake/MakeJava.cmake index 929a66b396..89efbb7a69 100644 --- a/buildtools/Cmake/MakeJava.cmake +++ b/buildtools/Cmake/MakeJava.cmake @@ -1,3 +1,7 @@ +cmake_minimum_required(VERSION 2.8.6) + +include(UseJava) + # Rules to build libSG_java # add_library(SG_java SHARED ${JMSG_C_SRC}) -- 2.20.1