From b8f2d9d2b654e9ab334973df69c4d248c8becaf4 Mon Sep 17 00:00:00 2001 From: Bastian Dehn Date: Sun, 6 Feb 2022 16:21:56 +0100 Subject: [PATCH] change: spandisc jar file for dependency --- CMakeLists.txt | 7 +++++-- src/manifest.mf | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ec93ff8..f74e889 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,6 +24,9 @@ set(SRCLIB_FILES "${SRCLIB_PREFIX}/IAddFileToMedium.java" "${SRCLIB_PREFIX}/IStatus.java") +add_jar(spandisc "${SRCLIB_FILES}") +get_target_property(_jarFile spandisc JAR_FILE) + set(SRC_PREFIX "src/de/hhaalo/discspan") set(SRC_FILES "${SRC_PREFIX}/discspan.java" @@ -31,6 +34,6 @@ set(SRC_FILES "${SRC_PREFIX}/Iparameter.java" "${SRC_PREFIX}/parameter.java") -add_jar(discspan "${SRC_FILES}" "${SRCLIB_FILES}" - INCLUDE_JARS "${GNUGETOPT}" +add_jar(discspan "${SRC_FILES}" + INCLUDE_JARS "${GNUGETOPT}" "${_jarFile}" MANIFEST "src/manifest.mf") diff --git a/src/manifest.mf b/src/manifest.mf index 496b6c2..511e74f 100644 --- a/src/manifest.mf +++ b/src/manifest.mf @@ -1,3 +1,3 @@ Manifest-version: 1.0 Main-Class: de.hhaalo.discspan.discspan -Class-Path: /usr/share/java/gnu-getopt.jar +Class-Path: /usr/share/java/gnu-getopt.jar spandisc.jar -- 2.39.5