[build] cmake: Export jars and clean up jar installs (#6014)

2026-06-19 00:41:43 +00:00 · 2023-12-06 21:28:38 -05:00
parent 38bf024c96
commit f5fc101fda
26 changed files with 82 additions and 54 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -219,9 +219,11 @@ set(CSCORE_DEP_REPLACE_IMPL "find_dependency(cscore)")
 set(HAL_DEP_REPLACE_IMPL "find_dependency(hal)")
 set(NTCORE_DEP_REPLACE "find_dependency(ntcore)")
 set(WPILIBC_DEP_REPLACE_IMPL "find_dependency(wpilibc)")
+set(WPILIBJ_DEP_REPLACE "find_dependency(wpilibj)")
 set(WPILIBNEWCOMMANDS_DEP_REPLACE "find_dependency(wpilibNewCommands)")
 set(WPIMATH_DEP_REPLACE "find_dependency(wpimath)")
 set(WPINET_DEP_REPLACE "find_dependency(wpinet)")
+set(WPIUNITS_DEP_REPLACE "find_dependency(wpiunits)")
 set(WPIUTIL_DEP_REPLACE "find_dependency(wpiutil)")

 set(FILENAME_DEP_REPLACE "get_filename_component(SELF_DIR \"$\{CMAKE_CURRENT_LIST_FILE\}\" PATH)")
--- a/apriltag/CMakeLists.txt
+++ b/apriltag/CMakeLists.txt
@@ -64,10 +64,8 @@ if(WITH_JAVA)
        GENERATE_NATIVE_HEADERS apriltag_jni_headers
    )

-    get_property(APRILTAG_JAR_FILE TARGET apriltag_jar PROPERTY JAR_FILE)
-    install(FILES ${APRILTAG_JAR_FILE} DESTINATION "${java_lib_dest}")
-
-    set_property(TARGET apriltag_jar PROPERTY FOLDER "java")
+    install_jar(apriltag_jar DESTINATION ${java_lib_dest})
+    install_jar_exports(TARGETS apriltag_jar FILE apriltag_jar.cmake DESTINATION share/apriltag)

    add_library(apriltagjni ${apriltag_jni_src})
    wpilib_target_warnings(apriltagjni)
--- a/apriltag/apriltag-config.cmake.in
+++ b/apriltag/apriltag-config.cmake.in
@@ -5,3 +5,6 @@ include(CMakeFindDependencyMacro)

@FILENAME_DEP_REPLACE@
 include(${SELF_DIR}/apriltag.cmake)
+if(@WITH_JAVA@)
+    include(${SELF_DIR}/apriltag_jar.cmake)
+endif()
--- a/cameraserver/CMakeLists.txt
+++ b/cameraserver/CMakeLists.txt
@@ -31,10 +31,12 @@ if(WITH_JAVA)
        OUTPUT_NAME cameraserver
    )

-    get_property(CAMERASERVER_JAR_FILE TARGET cameraserver_jar PROPERTY JAR_FILE)
-    install(FILES ${CAMERASERVER_JAR_FILE} DESTINATION "${java_lib_dest}")
-
-    set_property(TARGET cameraserver_jar PROPERTY FOLDER "java")
+    install_jar(cameraserver_jar DESTINATION ${java_lib_dest})
+    install_jar_exports(
+        TARGETS cameraserver_jar
+        FILE cameraserver_jar.cmake
+        DESTINATION share/cameraserver
+    )
 endif()

 if(WITH_JAVA_SOURCE)
--- a/cameraserver/cameraserver-config.cmake.in
+++ b/cameraserver/cameraserver-config.cmake.in
@@ -7,3 +7,6 @@ find_dependency(OpenCV)

@FILENAME_DEP_REPLACE@
 include(${SELF_DIR}/cameraserver.cmake)
+if(@WITH_JAVA@)
+    include(${SELF_DIR}/cameraserver_jar.cmake)
+endif()
--- a/cscore/CMakeLists.txt
+++ b/cscore/CMakeLists.txt
@@ -129,8 +129,8 @@ if(WITH_JAVA)
        GENERATE_NATIVE_HEADERS cscore_jni_headers
    )

-    get_property(CSCORE_JAR_FILE TARGET cscore_jar PROPERTY JAR_FILE)
-    install(FILES ${CSCORE_JAR_FILE} DESTINATION "${java_lib_dest}")
+    install_jar(cscore_jar DESTINATION ${java_lib_dest})
+    install_jar_exports(TARGETS cscore_jar FILE cscore_jar.cmake DESTINATION share/cscore)
    install(FILES ${OPENCV_JAR_FILE} DESTINATION "${java_lib_dest}")

    if(MSVC)
@@ -153,8 +153,6 @@ if(WITH_JAVA)
        endforeach()
    endif()

-    set_property(TARGET cscore_jar PROPERTY FOLDER "java")
-
    add_library(cscorejni ${cscore_jni_src})
    wpilib_target_warnings(cscorejni)
    target_link_libraries(cscorejni PUBLIC cscore wpiutil ${OpenCV_LIBS})
--- a/cscore/cscore-config.cmake.in
+++ b/cscore/cscore-config.cmake.in
@@ -5,3 +5,6 @@ find_dependency(OpenCV)

@FILENAME_DEP_REPLACE@
 include(${SELF_DIR}/cscore.cmake)
+if(@WITH_JAVA@)
+    include(${SELF_DIR}/cscore_jar.cmake)
+endif()
--- a/hal/CMakeLists.txt
+++ b/hal/CMakeLists.txt
@@ -74,10 +74,8 @@ if(WITH_JAVA)
        GENERATE_NATIVE_HEADERS hal_jni_headers
    )

-    get_property(HAL_JAR_FILE TARGET hal_jar PROPERTY JAR_FILE)
-    install(FILES ${HAL_JAR_FILE} DESTINATION "${java_lib_dest}")
-
-    set_property(TARGET hal_jar PROPERTY FOLDER "java")
+    install_jar(hal_jar DESTINATION ${java_lib_dest})
+    install_jar_exports(TARGETS hal_jar FILE hal_jar.cmake DESTINATION share/hal)

    add_library(haljni ${hal_shared_jni_src})

--- a/hal/hal-config.cmake.in
+++ b/hal/hal-config.cmake.in
@@ -4,3 +4,6 @@ include(CMakeFindDependencyMacro)

@FILENAME_DEP_REPLACE@
 include(${SELF_DIR}/hal.cmake)
+if(@WITH_JAVA@)
+    include(${SELF_DIR}/hal_jar.cmake)
+endif()
--- a/ntcore/CMakeLists.txt
+++ b/ntcore/CMakeLists.txt
@@ -60,10 +60,8 @@ if(WITH_JAVA)
        GENERATE_NATIVE_HEADERS ntcore_jni_headers
    )

-    get_property(NTCORE_JAR_FILE TARGET ntcore_jar PROPERTY JAR_FILE)
-    install(FILES ${NTCORE_JAR_FILE} DESTINATION "${java_lib_dest}")
-
-    set_property(TARGET ntcore_jar PROPERTY FOLDER "java")
+    install_jar(ntcore_jar DESTINATION ${java_lib_dest})
+    install_jar_exports(TARGETS ntcore_jar FILE ntcore_jar.cmake DESTINATION share/ntcore)

    add_library(ntcorejni ${ntcore_jni_src})
    wpilib_target_warnings(ntcorejni)
--- a/ntcore/ntcore-config.cmake.in
+++ b/ntcore/ntcore-config.cmake.in
@@ -5,3 +5,6 @@ include(CMakeFindDependencyMacro)

@FILENAME_DEP_REPLACE@
 include(${SELF_DIR}/ntcore.cmake)
+if(@WITH_JAVA@)
+    include(${SELF_DIR}/ntcore_jar.cmake)
+endif()
--- a/romiVendordep/CMakeLists.txt
+++ b/romiVendordep/CMakeLists.txt
@@ -25,10 +25,12 @@ if(WITH_JAVA)
        OUTPUT_NAME romiVendordep
    )

-    get_property(ROMIVENDORDEP_JAR_FILE TARGET romiVendordep_jar PROPERTY JAR_FILE)
-    install(FILES ${ROMIVENDORDEP_JAR_FILE} DESTINATION "${java_lib_dest}")
-
-    set_property(TARGET romiVendordep_jar PROPERTY FOLDER "java")
+    install_jar(romiVendordep_jar DESTINATION ${java_lib_dest})
+    install_jar_exports(
+        TARGETS romiVendordep_jar
+        FILE romiVendordep_jar.cmake
+        DESTINATION share/romiVendordep
+    )
 endif()

 if(WITH_JAVA_SOURCE)
--- a/romiVendordep/romiVendordep-config.cmake.in
+++ b/romiVendordep/romiVendordep-config.cmake.in
@@ -9,3 +9,6 @@ include(CMakeFindDependencyMacro)

 @FILENAME_DEP_REPLACE@
 include(${SELF_DIR}/romiVendordep.cmake)
+ if(@WITH_JAVA@)
+     include(${SELF_DIR}/romiVendordep_jar.cmake)
+ endif()
--- a/wpilib-config.cmake.in
+++ b/wpilib-config.cmake.in
@@ -15,3 +15,7 @@ find_dependency(Threads)
@WPIMATH_DEP_REPLACE@
@WPINET_DEP_REPLACE@
@WPIUTIL_DEP_REPLACE@
+if(@WITH_JAVA@)
+    @WPILIBJ_DEP_REPLACE@
+    @WPIUNITS_DEP_REPLACE@
+endif()
--- a/wpilibNewCommands/CMakeLists.txt
+++ b/wpilibNewCommands/CMakeLists.txt
@@ -25,10 +25,12 @@ if(WITH_JAVA)
        OUTPUT_NAME wpilibNewCommands
    )

-    get_property(WPILIBNEWCOMMANDS_JAR_FILE TARGET wpilibNewCommands_jar PROPERTY JAR_FILE)
-    install(FILES ${WPILIBNEWCOMMANDS_JAR_FILE} DESTINATION "${java_lib_dest}")
-
-    set_property(TARGET wpilibNewCommands_jar PROPERTY FOLDER "java")
+    install_jar(wpilibNewCommands_jar DESTINATION ${java_lib_dest})
+    install_jar_exports(
+        TARGETS wpilibNewCommands_jar
+        FILE wpilibNewCommands_jar.cmake
+        DESTINATION share/wpilibNewCommands
+    )
 endif()

 if(WITH_JAVA_SOURCE)
--- a/wpilibNewCommands/wpilibNewCommands-config.cmake.in
+++ b/wpilibNewCommands/wpilibNewCommands-config.cmake.in
@@ -9,3 +9,6 @@ include(CMakeFindDependencyMacro)

 @FILENAME_DEP_REPLACE@
 include(${SELF_DIR}/wpilibNewCommands.cmake)
+ if(@WITH_JAVA@)
+    include(${SELF_DIR}/wpilibNewCommands_jar.cmake)
+ endif()
--- a/wpilibj/CMakeLists.txt
+++ b/wpilibj/CMakeLists.txt
@@ -40,10 +40,8 @@ if(WITH_JAVA)
        OUTPUT_NAME wpilibj
    )

-    get_property(WPILIBJ_JAR_FILE TARGET wpilibj_jar PROPERTY JAR_FILE)
-    install(FILES ${WPILIBJ_JAR_FILE} DESTINATION "${java_lib_dest}")
-
-    set_property(TARGET wpilibj_jar PROPERTY FOLDER "java")
+    install_jar(wpilibj_jar DESTINATION ${java_lib_dest})
+    install_jar_exports(TARGETS wpilibj_jar FILE wpilibj.cmake DESTINATION share/wpilibj)

    install(FILES wpilibj-config.cmake DESTINATION share/wpilibj)
 endif()
--- a/wpimath/CMakeLists.txt
+++ b/wpimath/CMakeLists.txt
@@ -83,10 +83,8 @@ if(WITH_JAVA)
        GENERATE_NATIVE_HEADERS wpimath_jni_headers
    )

-    get_property(WPIMATH_JAR_FILE TARGET wpimath_jar PROPERTY JAR_FILE)
-    install(FILES ${WPIMATH_JAR_FILE} DESTINATION "${java_lib_dest}")
-
-    set_property(TARGET wpimath_jar PROPERTY FOLDER "java")
+    install_jar(wpimath_jar DESTINATION ${java_lib_dest})
+    install_jar_exports(TARGETS wpimath_jar FILE wpimath_jar.cmake DESTINATION share/wpimath)

    add_library(wpimathjni ${wpimath_jni_src})
    wpilib_target_warnings(wpimathjni)
--- a/wpimath/wpimath-config.cmake.in
+++ b/wpimath/wpimath-config.cmake.in
@@ -1,7 +1,6 @@
 include(CMakeFindDependencyMacro)
@FILENAME_DEP_REPLACE@
@WPIUTIL_DEP_REPLACE@
-@WPIUNITS_DEP_REPLACE@

 if(@USE_SYSTEM_EIGEN@)
    find_dependency(Eigen3)
@@ -9,3 +8,7 @@ endif()

@FILENAME_DEP_REPLACE@
 include(${SELF_DIR}/wpimath.cmake)
+if(@WITH_JAVA@)
+    @WPIUNITS_DEP_REPLACE@
+    include(${SELF_DIR}/wpimath_jar.cmake)
+endif()
--- a/wpinet/CMakeLists.txt
+++ b/wpinet/CMakeLists.txt
@@ -26,10 +26,8 @@ if(WITH_JAVA)
        GENERATE_NATIVE_HEADERS wpinet_jni_headers
    )

-    get_property(WPINET_JAR_FILE TARGET wpinet_jar PROPERTY JAR_FILE)
-    install(FILES ${WPINET_JAR_FILE} DESTINATION "${java_lib_dest}")
-
-    set_property(TARGET wpinet_jar PROPERTY FOLDER "java")
+    install_jar(wpinet_jar DESTINATION ${java_lib_dest})
+    install_jar_exports(TARGETS wpinet_jar FILE wpinet_jar.cmake DESTINATION share/wpinet)

    add_library(wpinetjni ${wpinet_jni_src})
    wpilib_target_warnings(wpinetjni)
--- a/wpinet/wpinet-config.cmake.in
+++ b/wpinet/wpinet-config.cmake.in
@@ -5,3 +5,6 @@ include(CMakeFindDependencyMacro)

@FILENAME_DEP_REPLACE@
 include(${SELF_DIR}/wpinet.cmake)
+if(@WITH_JAVA@)
+    include(${SELF_DIR}/wpinet_jar.cmake)
+endif()
--- a/wpiunits/CMakeLists.txt
+++ b/wpiunits/CMakeLists.txt
@@ -10,10 +10,7 @@ if(WITH_JAVA)

    add_jar(wpiunits_jar ${JAVA_SOURCES} OUTPUT_NAME wpiunits)

-    get_property(WPIUNITS_JAR_FILE TARGET wpiunits_jar PROPERTY JAR_FILE)
-    install(FILES ${WPIUNITS_JAR_FILE} DESTINATION "${java_lib_dest}")
-
-    set_property(TARGET wpiunits_jar PROPERTY FOLDER "java")
-
+    install_jar(wpiunits_jar DESTINATION ${java_lib_dest})
+    install_jar_exports(TARGETS wpiunits_jar FILE wpiunits.cmake DESTINATION share/wpiunits)
    install(FILES wpiunits-config.cmake DESTINATION share/wpiunits)
 endif()
--- a/wpiutil/CMakeLists.txt
+++ b/wpiutil/CMakeLists.txt
@@ -70,10 +70,8 @@ if(WITH_JAVA)
        GENERATE_NATIVE_HEADERS wpiutil_jni_headers
    )

-    get_property(WPIUTIL_JAR_FILE TARGET wpiutil_jar PROPERTY JAR_FILE)
-    install(FILES ${WPIUTIL_JAR_FILE} DESTINATION "${java_lib_dest}")
-
-    set_property(TARGET wpiutil_jar PROPERTY FOLDER "java")
+    install_jar(wpiutil_jar DESTINATION ${java_lib_dest})
+    install_jar_exports(TARGETS wpiutil_jar FILE wpiutil_jar.cmake DESTINATION share/wpiutil)

    add_library(wpiutiljni ${wpiutil_jni_src})
    wpilib_target_warnings(wpiutiljni)
--- a/wpiutil/wpiutil-config.cmake.in
+++ b/wpiutil/wpiutil-config.cmake.in
@@ -11,3 +11,6 @@ endif()

@FILENAME_DEP_REPLACE@
 include(${SELF_DIR}/wpiutil.cmake)
+if(@WITH_JAVA@)
+    include(${SELF_DIR}/wpiutil_jar.cmake)
+endif()
--- a/xrpVendordep/CMakeLists.txt
+++ b/xrpVendordep/CMakeLists.txt
@@ -25,10 +25,12 @@ if(WITH_JAVA)
        OUTPUT_NAME xrpVendordep
    )

-    get_property(xrpVendordep_JAR_FILE TARGET xrpVendordep_jar PROPERTY JAR_FILE)
-    install(FILES ${xrpVendordep_JAR_FILE} DESTINATION "${java_lib_dest}")
-
-    set_property(TARGET xrpVendordep_jar PROPERTY FOLDER "java")
+    install_jar(xrpVendordep_jar DESTINATION ${java_lib_dest})
+    install_jar_exports(
+        TARGETS xrpVendordep_jar
+        FILE xrpVendordep_jar.cmake
+        DESTINATION share/xrpVendordep
+    )
 endif()

 if(WITH_JAVA_SOURCE)
--- a/xrpVendordep/xrpVendordep-config.cmake.in
+++ b/xrpVendordep/xrpVendordep-config.cmake.in
@@ -9,3 +9,6 @@ include(CMakeFindDependencyMacro)

 @FILENAME_DEP_REPLACE@
 include(${SELF_DIR}/xrpVendordep.cmake)
+ if(@WITH_JAVA@)
+     include(${SELF_DIR}/xrpVendordep_jar.cmake)
+ endif()