--- base/CMakeLists.txt.orig 2026-07-28 16:37:15 UTC +++ base/CMakeLists.txt @@ -15,6 +15,7 @@ find_file(SERVLET_JAR tomcat-servlet-api.jar tomcat9-servlet-api.jar PATHS + ${CMAKE_INSTALL_PREFIX}/apache-tomcat-9.0/lib /usr/share/java ) @@ -44,7 +45,7 @@ else() PATHS /usr/share/java ) - set(JAXRS_API_LINK "../../../..${JAXRS_API_JAR}") + set(JAXRS_API_LINK "../../../../..${JAXRS_API_JAR}") endif (JAXRS_API_VERSION) @@ -85,6 +86,7 @@ else() NAMES slf4j-api.jar PATHS + ${CMAKE_INSTALL_PREFIX}/share/java/classes /usr/share/java/slf4j /usr/share/java ) @@ -92,12 +94,13 @@ else() NAMES slf4j-jdk14.jar PATHS + ${CMAKE_INSTALL_PREFIX}/share/java/slf4j /usr/share/java/slf4j /usr/share/java ) endif(XMVN_RESOLVE) - set(SLF4J_API_LINK "../../../..${SLF4J_API_JAR}") - set(SLF4J_JDK14_LINK "../../../..${SLF4J_JDK14_JAR}") + set(SLF4J_API_LINK "../../../../..${SLF4J_API_JAR}") + set(SLF4J_JDK14_LINK "../../../../..${SLF4J_JDK14_JAR}") endif (SLF4J_VERSION) @@ -130,10 +133,11 @@ else() NAMES commons-cli.jar PATHS + ${CMAKE_INSTALL_PREFIX}/share/java/classes /usr/share/java ) endif(XMVN_RESOLVE) - set(COMMONS_CLI_LINK "../../../..${COMMONS_CLI_JAR}") + set(COMMONS_CLI_LINK "../../../../..${COMMONS_CLI_JAR}") endif (COMMONS_CLI_VERSION) @@ -166,10 +170,11 @@ else() NAMES commons-codec.jar PATHS + ${CMAKE_INSTALL_PREFIX}/share/java/classes /usr/share/java ) endif(XMVN_RESOLVE) - set(COMMONS_CODEC_LINK "../../../..${COMMONS_CODEC_JAR}") + set(COMMONS_CODEC_LINK "../../../../..${COMMONS_CODEC_JAR}") endif (COMMONS_CODEC_VERSION) @@ -202,10 +207,11 @@ else() NAMES commons-io.jar PATHS + ${CMAKE_INSTALL_PREFIX}/share/java/classes /usr/share/java ) endif(XMVN_RESOLVE) - set(COMMONS_IO_LINK "../../../..${COMMONS_IO_JAR}") + set(COMMONS_IO_LINK "../../../../..${COMMONS_IO_JAR}") endif (COMMONS_IO_VERSION) @@ -238,10 +244,11 @@ else() NAMES commons-lang3.jar PATHS + ${CMAKE_INSTALL_PREFIX}/share/java/classes /usr/share/java ) endif(XMVN_RESOLVE) - set(COMMONS_LANG3_LINK "../../../..${COMMONS_LANG3_JAR}") + set(COMMONS_LANG3_LINK "../../../../..${COMMONS_LANG3_JAR}") endif (COMMONS_LANG3_VERSION) @@ -274,10 +281,11 @@ else() NAMES commons-logging.jar PATHS + ${CMAKE_INSTALL_PREFIX}/share/java/classes /usr/share/java ) endif(XMVN_RESOLVE) - set(COMMONS_LOGGING_LINK "../../../..${COMMONS_LOGGING_JAR}") + set(COMMONS_LOGGING_LINK "../../../../..${COMMONS_LOGGING_JAR}") endif (COMMONS_LOGGING_VERSION) @@ -310,10 +318,11 @@ else() NAMES commons-net.jar PATHS + ${CMAKE_INSTALL_PREFIX}/share/java/classes /usr/share/java ) endif(XMVN_RESOLVE) - set(COMMONS_NET_LINK "../../../..${COMMONS_NET_JAR}") + set(COMMONS_NET_LINK "../../../../..${COMMONS_NET_JAR}") endif (COMMONS_NET_VERSION) @@ -354,11 +363,12 @@ else() NAMES httpclient.jar PATHS + ${CMAKE_INSTALL_PREFIX}/share/java/classes /usr/share/java/httpcomponents /usr/share/java ) endif(XMVN_RESOLVE) - set(HTTPCLIENT_LINK "../../../..${HTTPCLIENT_JAR}") + set(HTTPCLIENT_LINK "../../../../..${HTTPCLIENT_JAR}") endif (HTTPCLIENT_VERSION) @@ -391,11 +401,12 @@ else() NAMES httpcore.jar PATHS + ${CMAKE_INSTALL_PREFIX}/share/java/classes /usr/share/java/httpcomponents /usr/share/java ) endif(XMVN_RESOLVE) - set(HTTPCORE_LINK "../../../..${HTTPCORE_JAR}") + set(HTTPCORE_LINK "../../../../..${HTTPCORE_JAR}") endif (HTTPCORE_VERSION) @@ -423,7 +434,7 @@ else() PATHS /usr/share/java ) - set(JACKSON_ANNOTATIONS_LINK "../../../..${JACKSON_ANNOTATIONS_JAR}") + set(JACKSON_ANNOTATIONS_LINK "../../../../..${JACKSON_ANNOTATIONS_JAR}") endif (JACKSON_ANNOTATIONS_VERSION) @@ -463,7 +474,7 @@ else() PATHS /usr/share/java ) - set(JACKSON_CORE_LINK "../../../..${JACKSON_CORE_JAR}") + set(JACKSON_CORE_LINK "../../../../..${JACKSON_CORE_JAR}") find_file(JACKSON_DATABIND_JAR NAMES @@ -471,7 +482,7 @@ else() PATHS /usr/share/java ) - set(JACKSON_DATABIND_LINK "../../../..${JACKSON_DATABIND_JAR}") + set(JACKSON_DATABIND_LINK "../../../../..${JACKSON_DATABIND_JAR}") find_file(JACKSON_JAXRS_BASE_JAR NAMES @@ -480,7 +491,7 @@ else() /usr/share/java/jackson-jaxrs-providers /usr/share/java ) - set(JACKSON_JAXRS_BASE_LINK "../../../..${JACKSON_JAXRS_BASE_JAR}") + set(JACKSON_JAXRS_BASE_LINK "../../../../..${JACKSON_JAXRS_BASE_JAR}") find_file(JACKSON_JAXRS_JSON_PROVIDER_JAR NAMES @@ -489,7 +500,7 @@ else() /usr/share/java/jackson-jaxrs-providers /usr/share/java ) - set(JACKSON_JAXRS_JSON_PROVIDER_LINK "../../../..${JACKSON_JAXRS_JSON_PROVIDER_JAR}") + set(JACKSON_JAXRS_JSON_PROVIDER_LINK "../../../../..${JACKSON_JAXRS_JSON_PROVIDER_JAR}") find_file(JACKSON_MODULE_JAXB_ANNOTATIONS_JAR NAMES @@ -498,7 +509,7 @@ else() /usr/share/java/jackson-modules /usr/share/java ) - set(JACKSON_MODULE_JAXB_ANNOTATIONS_LINK "../../../..${JACKSON_MODULE_JAXB_ANNOTATIONS_JAR}") + set(JACKSON_MODULE_JAXB_ANNOTATIONS_LINK "../../../../..${JACKSON_MODULE_JAXB_ANNOTATIONS_JAR}") endif (JACKSON_CORE_VERSION) @@ -532,12 +543,13 @@ else() jakarta.xml.bind-api.jar jaxb-api.jar PATHS + ${CMAKE_INSTALL_PREFIX}/share/java/classes /usr/share/java/jaxb-api4 /usr/share/java/jaxb-api /usr/share/java ) endif(XMVN_RESOLVE) - set(JAXB_API_LINK "../../../..${JAXB_API_JAR}") + set(JAXB_API_LINK "../../../../..${JAXB_API_JAR}") endif (JAXB_API_VERSION) @@ -574,6 +586,7 @@ else() javax.activation.jar javax-activation.jar PATHS + ${CMAKE_INSTALL_PREFIX}/share/java/classes /usr/share/java/jakarta-activation /usr/share/java/jakarta /usr/share/java/javax-activation @@ -581,7 +594,7 @@ else() /usr/share/java ) endif(XMVN_RESOLVE) - set(JAKARTA_ACTIVATION_API_LINK "../../../..${JAKARTA_ACTIVATION_API_JAR}") + set(JAKARTA_ACTIVATION_API_LINK "../../../../..${JAKARTA_ACTIVATION_API_JAR}") endif (JAKARTA_ACTIVATION_API_VERSION) @@ -608,11 +621,12 @@ else() jakarta.annotation-api.jar jboss-annotations-api_1.2_spec.jar PATHS + ${CMAKE_INSTALL_PREFIX}/share/java/classes /usr/share/java/jakarta-annotations /usr/share/java/jboss-annotations-1.2-api /usr/share/java ) - set(JAKARTA_ANNOTATION_API_LINK "../../../..${JAKARTA_ANNOTATION_API_JAR}") + set(JAKARTA_ANNOTATION_API_LINK "../../../../..${JAKARTA_ANNOTATION_API_JAR}") endif (JAKARTA_ANNOTATION_API_VERSION) @@ -639,10 +653,11 @@ else() NAMES jboss-logging.jar PATHS + ${CMAKE_INSTALL_PREFIX}/share/java/classes /usr/share/java/jboss-logging /usr/share/java ) - set(JBOSS_LOGGING_LINK "../../../..${JBOSS_LOGGING_JAR}") + set(JBOSS_LOGGING_LINK "../../../../..${JBOSS_LOGGING_JAR}") endif (JBOSS_LOGGING_VERSION) @@ -749,7 +764,7 @@ else() /usr/share/java/resteasy /usr/share/java ) - set(RESTEASY_JAXRS_LINK "../../../..${RESTEASY_JAXRS_JAR}") + set(RESTEASY_JAXRS_LINK "../../../../..${RESTEASY_JAXRS_JAR}") find_file(RESTEASY_JACKSON_PROVIDER_JAR NAMES @@ -758,7 +773,7 @@ else() /usr/share/java/resteasy /usr/share/java ) - set(RESTEASY_JACKSON_PROVIDER_LINK "../../../..${RESTEASY_JACKSON_PROVIDER_JAR}") + set(RESTEASY_JACKSON_PROVIDER_LINK "../../../../..${RESTEASY_JACKSON_PROVIDER_JAR}") find_file(RESTEASY_SERVLET_INITIALIZER_JAR NAMES @@ -785,6 +800,7 @@ find_file(TOMCAT_API_JAR tomcat-api.jar tomcat9-api.jar PATHS + ${CMAKE_INSTALL_PREFIX}/apache-tomcat-9.0/lib /usr/share/java/tomcat /usr/share/java ) @@ -794,6 +810,7 @@ find_file(TOMCAT_CATALINA_JAR catalina.jar tomcat9-catalina.jar PATHS + ${CMAKE_INSTALL_PREFIX}/apache-tomcat-9.0/lib /usr/share/java/tomcat /usr/share/java ) @@ -803,6 +820,7 @@ find_file(TOMCAT_COYOTE_JAR tomcat-coyote.jar tomcat9-coyote.jar PATHS + ${CMAKE_INSTALL_PREFIX}/apache-tomcat-9.0/lib /usr/share/java/tomcat /usr/share/java ) @@ -812,6 +830,7 @@ find_file(TOMCAT_UTIL_JAR tomcat-util.jar tomcat9-util.jar PATHS + ${CMAKE_INSTALL_PREFIX}/apache-tomcat-9.0/lib /usr/share/java/tomcat /usr/share/java ) @@ -821,6 +840,7 @@ find_file(TOMCAT_UTIL_SCAN_JAR tomcat-util-scan.jar tomcat9-util-scan.jar PATHS + ${CMAKE_INSTALL_PREFIX}/apache-tomcat-9.0/lib /usr/share/java/tomcat /usr/share/java )