Remove unnecessary JAR includes

wpilibsuite · Jul 4, 2024 · e7e8c48 · e7e8c48
1 parent 27fc3ce
commit e7e8c48
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 12 deletions.
diff --git a/apriltag/CMakeLists.txt b/apriltag/CMakeLists.txt
@@ -45,8 +45,6 @@ if(WITH_JAVA)
         NO_DEFAULT_PATH
     )
 
-    set(CMAKE_JAVA_INCLUDE_PATH apriltag.jar ${EJML_JARS} ${JACKSON_JARS})
-
     file(GLOB_RECURSE JAVA_SOURCES src/main/java/*.java)
     file(
         GLOB_RECURSE JAVA_RESOURCES
@@ -58,7 +56,13 @@ if(WITH_JAVA)
         SOURCES ${JAVA_SOURCES}
         RESOURCES
         NAMESPACE "edu/wpi/first/apriltag" ${JAVA_RESOURCES}
-        INCLUDE_JARS wpimath_jar wpiunits_jar ${EJML_JARS} wpiutil_jar ${OPENCV_JAR_FILE}
+        INCLUDE_JARS
+            wpimath_jar
+            wpiunits_jar
+            wpiutil_jar
+            ${EJML_JARS}
+            ${OPENCV_JAR_FILE}
+            ${JACKSON_JARS}
         OUTPUT_NAME apriltag
         OUTPUT_DIR ${WPILIB_BINARY_DIR}/${java_lib_dest}
         GENERATE_NATIVE_HEADERS apriltag_jni_headers

diff --git a/fieldImages/CMakeLists.txt b/fieldImages/CMakeLists.txt
@@ -7,7 +7,6 @@ if(WITH_JAVA)
     include(UseJava)
 
     file(GLOB JACKSON_JARS "${WPILIB_BINARY_DIR}/wpiutil/thirdparty/jackson/*.jar")
-    set(CMAKE_JAVA_INCLUDE_PATH fieldImages.jar ${JACKSON_JARS})
 
     file(GLOB_RECURSE JAVA_SOURCES src/main/java/*.java)
     file(
@@ -22,6 +21,7 @@ if(WITH_JAVA)
         SOURCES ${JAVA_SOURCES}
         RESOURCES
         NAMESPACE "edu/wpi/first/fields" ${JAVA_RESOURCES}
+        INCLUDE_JARS ${JACKSON_JARS}
         OUTPUT_DIR ${WPILIB_BINARY_DIR}/${java_lib_dest}
         OUTPUT_NAME fieldImages
     )

diff --git a/ntcore/CMakeLists.txt b/ntcore/CMakeLists.txt
@@ -43,8 +43,6 @@ if(WITH_JAVA)
 
     file(GLOB QUICKBUF_JAR ${WPILIB_BINARY_DIR}/wpiutil/thirdparty/quickbuf/*.jar)
 
-    set(CMAKE_JAVA_INCLUDE_PATH wpimath.jar ${QUICKBUF_JAR})
-
     file(GLOB ntcore_jni_src src/main/native/cpp/jni/*.cpp src/generated/main/native/cpp/jni/*.cpp)
 
     file(GLOB_RECURSE JAVA_SOURCES src/main/java/*.java src/generated/main/java/*.java)
@@ -53,7 +51,7 @@ if(WITH_JAVA)
     add_jar(
         ntcore_jar
         ${JAVA_SOURCES}
-        INCLUDE_JARS wpiutil_jar
+        INCLUDE_JARS wpiutil_jar ${QUICKBUF_JAR}
         OUTPUT_NAME ntcore
         OUTPUT_DIR ${WPILIB_BINARY_DIR}/${java_lib_dest}
         GENERATE_NATIVE_HEADERS ntcore_jni_headers

diff --git a/wpimath/CMakeLists.txt b/wpimath/CMakeLists.txt
@@ -75,16 +75,14 @@ if(WITH_JAVA)
     file(GLOB JACKSON_JARS "${WPILIB_BINARY_DIR}/wpiutil/thirdparty/jackson/*.jar")
     file(GLOB QUICKBUF_JAR ${WPILIB_BINARY_DIR}/wpiutil/thirdparty/quickbuf/*.jar)
 
-    set(CMAKE_JAVA_INCLUDE_PATH wpimath.jar ${EJML_JARS} ${JACKSON_JARS} ${QUICKBUF_JAR})
-
     set(CMAKE_JNI_TARGET true)
 
     file(GLOB_RECURSE JAVA_SOURCES src/main/java/*.java src/generated/main/java/*.java)
 
     add_jar(
         wpimath_jar
         ${JAVA_SOURCES}
-        INCLUDE_JARS ${EJML_JARS} wpiutil_jar wpiunits_jar
+        INCLUDE_JARS wpiutil_jar wpiunits_jar ${EJML_JARS} ${JACKSON_JARS} ${QUICKBUF_JAR}
         OUTPUT_NAME wpimath
         OUTPUT_DIR ${WPILIB_BINARY_DIR}/${java_lib_dest}
         GENERATE_NATIVE_HEADERS wpimath_jni_headers

diff --git a/wpiutil/CMakeLists.txt b/wpiutil/CMakeLists.txt
@@ -55,8 +55,6 @@ if(WITH_JAVA)
 
     file(GLOB QUICKBUF_JAR ${WPILIB_BINARY_DIR}/wpiutil/thirdparty/quickbuf/*.jar)
 
-    set(CMAKE_JAVA_INCLUDE_PATH wpiutil.jar ${JACKSON_JARS} ${QUICKBUF_JAR})
-
     set(CMAKE_JNI_TARGET true)
 
     file(GLOB_RECURSE JAVA_SOURCES src/main/java/*.java)