|
Line
Link Here
|
| 0 |
-- a/libraries/launcher/CMakeLists.txt |
0 |
++ b/libraries/launcher/CMakeLists.txt |
|
Lines 1-10
Link Here
|
| 1 |
cmake_minimum_required(VERSION 3.9.4) |
1 |
cmake_minimum_required(VERSION 3.9.4) |
| 2 |
project(launcher Java) |
2 |
project(launcher Java) |
| 3 |
find_package(Java 1.7 REQUIRED COMPONENTS Development) |
3 |
find_package(Java 1.8 REQUIRED COMPONENTS Development) |
| 4 |
|
4 |
|
| 5 |
include(UseJava) |
5 |
include(UseJava) |
| 6 |
set(CMAKE_JAVA_JAR_ENTRY_POINT org.prismlauncher.EntryPoint) |
6 |
set(CMAKE_JAVA_JAR_ENTRY_POINT org.prismlauncher.EntryPoint) |
| 7 |
set(CMAKE_JAVA_COMPILE_FLAGS -target 7 -source 7) |
7 |
set(CMAKE_JAVA_COMPILE_FLAGS -target 8 -source 8) |
| 8 |
|
8 |
|
| 9 |
set(SRC |
9 |
set(SRC |
| 10 |
org/prismlauncher/EntryPoint.java |
10 |
org/prismlauncher/EntryPoint.java |
| 11 |
-- a/flatpak/org.prismlauncher.PrismLauncher.yml |
11 |
++ b/flatpak/org.prismlauncher.PrismLauncher.yml |
|
Lines 40-47
modules:
Link Here
|
| 40 |
- -DLauncher_QT_VERSION_MAJOR=5 |
40 |
- -DLauncher_QT_VERSION_MAJOR=5 |
| 41 |
build-options: |
41 |
build-options: |
| 42 |
env: |
42 |
env: |
| 43 |
JAVA_HOME: /usr/lib/sdk/openjdk17/jvm/openjdk-17 |
43 |
JAVA_HOME: "$(java-config -O)" |
| 44 |
JAVA_COMPILER: /usr/lib/sdk/openjdk17/jvm/openjdk-17/bin/javac |
44 |
JAVA_COMPILER: "$(java-config -c)" |
| 45 |
sources: |
45 |
sources: |
| 46 |
- type: dir |
46 |
- type: dir |
| 47 |
path: ../ |
47 |
path: ../ |
| 48 |
-- a/libraries/javacheck/CMakeLists.txt |
48 |
++ b/libraries/javacheck/CMakeLists.txt |
|
Lines 1-10
Link Here
|
| 1 |
cmake_minimum_required(VERSION 3.9.4) |
1 |
cmake_minimum_required(VERSION 3.9.4) |
| 2 |
project(launcher Java) |
2 |
project(launcher Java) |
| 3 |
find_package(Java 1.7 REQUIRED COMPONENTS Development) |
3 |
find_package(Java 1.8 REQUIRED COMPONENTS Development) |
| 4 |
|
4 |
|
| 5 |
include(UseJava) |
5 |
include(UseJava) |
| 6 |
set(CMAKE_JAVA_JAR_ENTRY_POINT JavaCheck) |
6 |
set(CMAKE_JAVA_JAR_ENTRY_POINT JavaCheck) |
| 7 |
set(CMAKE_JAVA_COMPILE_FLAGS -target 7 -source 7 -Xlint:deprecation -Xlint:unchecked) |
7 |
set(CMAKE_JAVA_COMPILE_FLAGS -target 8 -source 8 -Xlint:deprecation -Xlint:unchecked) |
| 8 |
|
8 |
|
| 9 |
set(SRC |
9 |
set(SRC |
| 10 |
JavaCheck.java |
10 |
JavaCheck.java |
