Skip to content

Commit 1fa4e1a

Browse files
committed
Migrate tagAruco*.{c,h} files in aruco folder
1 parent 4caf268 commit 1fa4e1a

38 files changed

Lines changed: 53 additions & 53 deletions

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ aux_source_directory(common COMMON_SRC)
7575
set(APRILTAG_SRCS apriltag.c apriltag_pose.c apriltag_quad_thresh.c)
7676

7777
# Library
78-
file(GLOB TAG_FILES ${CMAKE_CURRENT_SOURCE_DIR}/tag*.c)
78+
file(GLOB TAG_FILES ${CMAKE_CURRENT_SOURCE_DIR}/tag*.c ${CMAKE_CURRENT_SOURCE_DIR}/aruco/tag*.c)
7979
add_library(${PROJECT_NAME} ${APRILTAG_SRCS} ${COMMON_SRC} ${TAG_FILES})
8080
set_property(TARGET ${PROJECT_NAME} PROPERTY POSITION_INDEPENDENT_CODE ON)
8181

@@ -107,7 +107,7 @@ target_include_directories(${PROJECT_NAME} PUBLIC
107107

108108

109109
# install header file hierarchy
110-
file(GLOB HEADER_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.h common/*.h)
110+
file(GLOB HEADER_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.h common/*.h aruco/*.h)
111111
list(REMOVE_ITEM HEADER_FILES apriltag_detect.docstring.h apriltag_py_type.docstring.h)
112112

113113
foreach(HEADER ${HEADER_FILES})

apriltag_pywrap.c

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -20,23 +20,23 @@
2020
#include "tagCustom48h12.h"
2121
#include "tagStandard41h12.h"
2222
#include "tagStandard52h13.h"
23-
#include "tagAruco4x4_50.h"
24-
#include "tagAruco4x4_100.h"
25-
#include "tagAruco4x4_250.h"
26-
#include "tagAruco4x4_1000.h"
27-
#include "tagAruco5x5_50.h"
28-
#include "tagAruco5x5_100.h"
29-
#include "tagAruco5x5_250.h"
30-
#include "tagAruco5x5_1000.h"
31-
#include "tagAruco6x6_50.h"
32-
#include "tagAruco6x6_100.h"
33-
#include "tagAruco6x6_250.h"
34-
#include "tagAruco6x6_1000.h"
35-
#include "tagAruco7x7_50.h"
36-
#include "tagAruco7x7_100.h"
37-
#include "tagAruco7x7_250.h"
38-
#include "tagAruco7x7_1000.h"
39-
#include "tagArucoMIP36h12.h"
23+
#include "aruco/tagAruco4x4_50.h"
24+
#include "aruco/tagAruco4x4_100.h"
25+
#include "aruco/tagAruco4x4_250.h"
26+
#include "aruco/tagAruco4x4_1000.h"
27+
#include "aruco/tagAruco5x5_50.h"
28+
#include "aruco/tagAruco5x5_100.h"
29+
#include "aruco/tagAruco5x5_250.h"
30+
#include "aruco/tagAruco5x5_1000.h"
31+
#include "aruco/tagAruco6x6_50.h"
32+
#include "aruco/tagAruco6x6_100.h"
33+
#include "aruco/tagAruco6x6_250.h"
34+
#include "aruco/tagAruco6x6_1000.h"
35+
#include "aruco/tagAruco7x7_50.h"
36+
#include "aruco/tagAruco7x7_100.h"
37+
#include "aruco/tagAruco7x7_250.h"
38+
#include "aruco/tagAruco7x7_1000.h"
39+
#include "aruco/tagArucoMIP36h12.h"
4040

4141

4242
#define SUPPORTED_TAG_FAMILIES(_) \
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)