Skip to content

Commit

Permalink
Transition to pulling in AprilTag from submodule
Browse files Browse the repository at this point in the history
  • Loading branch information
Windwoes committed May 26, 2023
1 parent 8e8422f commit 559d6ef
Show file tree
Hide file tree
Showing 63 changed files with 34 additions and 21,740 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "apriltag/apriltag"]
path = apriltag/apriltag
url = git@github.com:AprilRobotics/apriltag.git
59 changes: 30 additions & 29 deletions apriltag/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,33 +21,34 @@ add_library( # Specifies the name of the library.
# Provides a relative path to your source file(s).
src/main/cpp/AprilTagDetectorJNI.cpp
src/main/cpp/AprilTagDetectionJNI.cpp
src/main/cpp/apriltag_common/src/g2d.c
src/main/cpp/apriltag_common/src/getopt.c
src/main/cpp/apriltag_common/src/homography.c
src/main/cpp/apriltag_common/src/image_u8.c
src/main/cpp/apriltag_common/src/image_u8x3.c
src/main/cpp/apriltag_common/src/image_u8x4.c
src/main/cpp/apriltag_common/src/matd.c
src/main/cpp/apriltag_common/src/pam.c
src/main/cpp/apriltag_common/src/pjpeg.c
src/main/cpp/apriltag_common/src/pjpeg-idct.c
src/main/cpp/apriltag_common/src/pnm.c
src/main/cpp/apriltag_common/src/string_util.c
src/main/cpp/apriltag_common/src/svd22.c
src/main/cpp/apriltag_common/src/time_util.c
src/main/cpp/apriltag_common/src/unionfind.c
src/main/cpp/apriltag_common/src/workerpool.c
src/main/cpp/apriltag_common/src/zarray.c
src/main/cpp/apriltag_common/src/zhash.c
src/main/cpp/apriltag_common/src/zmaxheap.c
src/main/cpp/apriltag/src/apriltag.c
src/main/cpp/apriltag/src/apriltag_pose.c
src/main/cpp/apriltag/src/apriltag_quad_thresh.c
src/main/cpp/apriltag/src/tag16h5.c
src/main/cpp/apriltag/src/tag25h9.c
src/main/cpp/apriltag/src/tag36h11.c
src/main/cpp/apriltag/src/tagCircle21h7.c
src/main/cpp/apriltag/src/tagStandard41h12.c)

apriltag/common/g2d.c
apriltag/common/getopt.c
apriltag/common/homography.c
apriltag/common/image_u8.c
apriltag/common/image_u8x3.c
apriltag/common/image_u8x4.c
apriltag/common/matd.c
apriltag/common/pam.c
apriltag/common/pjpeg.c
apriltag/common/pjpeg-idct.c
apriltag/common/pnm.c
apriltag/common/string_util.c
apriltag/common/svd22.c
apriltag/common/time_util.c
apriltag/common/unionfind.c
apriltag/common/workerpool.c
apriltag/common/zarray.c
apriltag/common/zhash.c
apriltag/common/zmaxheap.c
apriltag/apriltag.c
apriltag/apriltag_pose.c
apriltag/apriltag_quad_thresh.c
apriltag/tag16h5.c
apriltag/tag25h9.c
apriltag/tag36h11.c
apriltag/tagCircle21h7.c
apriltag/tagStandard41h12.c)

# VROOOOOOOM
target_compile_options(apriltag PRIVATE
Expand All @@ -57,8 +58,8 @@ target_compile_options(apriltag PRIVATE

# Specifies a path to native header files.
include_directories(
src/main/cpp/apriltag/include
src/main/cpp/apriltag_common/include
apriltag
apriltag/common
)

# linking libs
Expand Down
1 change: 1 addition & 0 deletions apriltag/apriltag
Submodule apriltag added at 25796c
276 changes: 0 additions & 276 deletions apriltag/src/main/cpp/apriltag/include/apriltag.h

This file was deleted.

Loading

0 comments on commit 559d6ef

Please sign in to comment.