Merge remote-tracking branch 'upstream/develop' into develop

This commit is contained in:
Lenny McLennington 2021-12-20 03:01:41 +00:00
commit 18a931eaa9
No known key found for this signature in database
GPG key ID: F0467078ECA45FCB
30 changed files with 435 additions and 24 deletions

View file

@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.1)
project(launcher Java)
find_package(Java 1.6 REQUIRED COMPONENTS Development)
find_package(Java 1.7 REQUIRED COMPONENTS Development)
include(UseJava)
set(CMAKE_JAVA_JAR_ENTRY_POINT JavaCheck)