aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDāvis Mosāns <davispuh@gmail.com>2021-12-10 03:15:01 +0200
committerDāvis Mosāns <davispuh@gmail.com>2021-12-10 03:15:01 +0200
commitc29b6164974f5608966259eeb05c9308b861f8d1 (patch)
tree5380cac771f40a4b064f74c2b5c94655bda2e7dd
parent80beccb2c4585260e5d170c68f72d3d303f777e0 (diff)
downloadPrismLauncher-c29b6164974f5608966259eeb05c9308b861f8d1.tar.gz
PrismLauncher-c29b6164974f5608966259eeb05c9308b861f8d1.tar.bz2
PrismLauncher-c29b6164974f5608966259eeb05c9308b861f8d1.zip
Update Java version to 7+
Otherwise currently it doesn't build with newer Java
-rw-r--r--libraries/javacheck/CMakeLists.txt4
-rw-r--r--libraries/launcher/CMakeLists.txt4
2 files changed, 4 insertions, 4 deletions
diff --git a/libraries/javacheck/CMakeLists.txt b/libraries/javacheck/CMakeLists.txt
index dba5a1ae..73b4b5c6 100644
--- a/libraries/javacheck/CMakeLists.txt
+++ b/libraries/javacheck/CMakeLists.txt
@@ -1,10 +1,10 @@
cmake_minimum_required(VERSION 3.1)
project(launcher Java)
-find_package(Java 1.6 REQUIRED COMPONENTS Development)
+find_package(Java 7 REQUIRED COMPONENTS Development)
include(UseJava)
set(CMAKE_JAVA_JAR_ENTRY_POINT JavaCheck)
-set(CMAKE_JAVA_COMPILE_FLAGS -target 1.6 -source 1.6 -Xlint:deprecation -Xlint:unchecked)
+set(CMAKE_JAVA_COMPILE_FLAGS -target 7 -source 7 -Xlint:deprecation -Xlint:unchecked)
set(SRC
JavaCheck.java
diff --git a/libraries/launcher/CMakeLists.txt b/libraries/launcher/CMakeLists.txt
index a64c601d..4db80de2 100644
--- a/libraries/launcher/CMakeLists.txt
+++ b/libraries/launcher/CMakeLists.txt
@@ -1,10 +1,10 @@
cmake_minimum_required(VERSION 3.1)
project(launcher Java)
-find_package(Java 1.6 REQUIRED COMPONENTS Development)
+find_package(Java 7 REQUIRED COMPONENTS Development)
include(UseJava)
set(CMAKE_JAVA_JAR_ENTRY_POINT org.multimc.EntryPoint)
-set(CMAKE_JAVA_COMPILE_FLAGS -target 1.6 -source 1.6 -Xlint:deprecation -Xlint:unchecked)
+set(CMAKE_JAVA_COMPILE_FLAGS -target 7 -source 7 -Xlint:deprecation -Xlint:unchecked)
set(SRC
org/multimc/EntryPoint.java