Skip to content

Commit dee271a

Browse files
MoscowskyAntonMoscowskyAnton
committed
reorginized cmakelists
1 parent a28b393 commit dee271a

File tree

2 files changed

+29
-140
lines changed

2 files changed

+29
-140
lines changed

‎CMakeLists.txt‎

Lines changed: 28 additions & 139 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,7 @@ catkin_package(
7676
###########
7777
## Build ##
7878
###########
79-
# main node
80-
add_executable(
81-
extended_object_detection_node
82-
src/extended_object_detection_node/extended_object_detection_node.cpp
79+
set( EOD_SRC
8380
# lib common
8481
src/lib/ObjectBase.cpp
8582
# types
@@ -125,6 +122,22 @@ add_executable(
125122
src/lib/relations/LogicRelations.cpp
126123
src/lib/relations/ThreeDimRangeRelation.cpp
127124
src/lib/relations/SpaceRelations.cpp
125+
src/lib/relations/SizeRelations.cpp
126+
)
127+
128+
set ( EOD_INCLUDE
129+
src/lib/include
130+
src/lib/detectors/include
131+
src/lib/relations/include
132+
src/lib/utils/include
133+
src/lib/types/include
134+
)
135+
136+
# main node
137+
add_executable(
138+
extended_object_detection_node
139+
src/extended_object_detection_node/extended_object_detection_node.cpp
140+
${EOD_SRC}
128141
)
129142

130143
if(TensorFlow)
@@ -267,102 +280,14 @@ endif(DLib)
267280
add_executable(
268281
offline_video
269282
src/offline/offline_video.cpp
270-
# lib common
271-
src/lib/ObjectBase.cpp
272-
# types
273-
src/lib/types/ComplexObjectGraph.cpp
274-
src/lib/types/ComplexObject.cpp
275-
src/lib/types/ExtendedObjectInfo.cpp
276-
src/lib/types/Attribute.cpp
277-
src/lib/types/SimpleObject.cpp
278-
src/lib/types/Tracker.cpp
279-
src/lib/types/Relationship.cpp
280-
src/lib/types/Filtering.cpp
281-
src/lib/types/Clusterization.cpp
282-
# lib utils
283-
src/lib/utils/geometry_utils.cpp
284-
src/lib/utils/drawing_utils.cpp
285-
src/lib/utils/contour_utils.cpp
286-
# lib detectors
287-
src/lib/detectors/HsvColorDetector.cpp
288-
src/lib/detectors/HaarCascadeDetector.cpp
289-
src/lib/detectors/SizeDetector.cpp
290-
src/lib/detectors/HistColorDetector.cpp
291-
src/lib/detectors/DimentionDetector.cpp
292-
src/lib/detectors/HoughDetector.cpp
293-
src/lib/detectors/BasicMotionDetector.cpp
294-
src/lib/detectors/ArucoDetector.cpp
295-
src/lib/detectors/PoseDetector.cpp
296-
src/lib/detectors/TensorFlowDetector.cpp
297-
src/lib/detectors/FeatureDetector.cpp
298-
src/lib/detectors/DnnDetector.cpp
299-
src/lib/detectors/QrDetector.cpp
300-
src/lib/detectors/QrZbarDetector.cpp
301-
src/lib/detectors/LogicDetector.cpp
302-
src/lib/detectors/BlobDetector.cpp
303-
src/lib/detectors/DepthDetector.cpp
304-
src/lib/detectors/RoughDistanceDetector.cpp
305-
src/lib/detectors/DistanceDetector.cpp
306-
src/lib/detectors/FaceDlibDetector.cpp
307-
src/lib/detectors/ExtractedInfoIdChecker.cpp
308-
src/lib/detectors/ExtractedInfoStringChecker.cpp
309-
310-
# lib relations
311-
src/lib/relations/ImageRangeRelation.cpp
312-
src/lib/relations/LogicRelations.cpp
313-
src/lib/relations/ThreeDimRangeRelation.cpp
314-
src/lib/relations/SpaceRelations.cpp
283+
${EOD_SRC}
315284
)
316285

317286
#offline image processor
318287
add_executable(
319288
offline_image
320289
src/offline/offline_image.cpp
321-
# lib common
322-
src/lib/ObjectBase.cpp
323-
# types
324-
src/lib/types/ComplexObjectGraph.cpp
325-
src/lib/types/ComplexObject.cpp
326-
src/lib/types/ExtendedObjectInfo.cpp
327-
src/lib/types/Attribute.cpp
328-
src/lib/types/SimpleObject.cpp
329-
src/lib/types/Tracker.cpp
330-
src/lib/types/Relationship.cpp
331-
src/lib/types/Filtering.cpp
332-
src/lib/types/Clusterization.cpp
333-
# lib utils
334-
src/lib/utils/geometry_utils.cpp
335-
src/lib/utils/drawing_utils.cpp
336-
src/lib/utils/contour_utils.cpp
337-
# lib detectors
338-
src/lib/detectors/HsvColorDetector.cpp
339-
src/lib/detectors/HaarCascadeDetector.cpp
340-
src/lib/detectors/SizeDetector.cpp
341-
src/lib/detectors/HistColorDetector.cpp
342-
src/lib/detectors/DimentionDetector.cpp
343-
src/lib/detectors/HoughDetector.cpp
344-
src/lib/detectors/BasicMotionDetector.cpp
345-
src/lib/detectors/ArucoDetector.cpp
346-
src/lib/detectors/PoseDetector.cpp
347-
src/lib/detectors/TensorFlowDetector.cpp
348-
src/lib/detectors/FeatureDetector.cpp
349-
src/lib/detectors/DnnDetector.cpp
350-
src/lib/detectors/QrDetector.cpp
351-
src/lib/detectors/QrZbarDetector.cpp
352-
src/lib/detectors/LogicDetector.cpp
353-
src/lib/detectors/BlobDetector.cpp
354-
src/lib/detectors/DepthDetector.cpp
355-
src/lib/detectors/RoughDistanceDetector.cpp
356-
src/lib/detectors/DistanceDetector.cpp
357-
src/lib/detectors/FaceDlibDetector.cpp
358-
src/lib/detectors/ExtractedInfoIdChecker.cpp
359-
src/lib/detectors/ExtractedInfoStringChecker.cpp
360-
361-
# lib relations
362-
src/lib/relations/ImageRangeRelation.cpp
363-
src/lib/relations/LogicRelations.cpp
364-
src/lib/relations/ThreeDimRangeRelation.cpp
365-
src/lib/relations/SpaceRelations.cpp
290+
${EOD_SRC}
366291
)
367292

368293
if(TensorFlow)
@@ -389,11 +314,7 @@ target_include_directories(
389314
extended_object_detection_node
390315
PRIVATE
391316
include
392-
src/lib/include
393-
src/lib/detectors/include
394-
src/lib/relations/include
395-
src/lib/utils/include
396-
src/lib/types/include
317+
${EOD_INCLUDE}
397318
${OpenCV_INCLUDE_DIRS}
398319
${TinyXML_INCLUDE_DIRS}
399320
${catkin_INCLUDE_DIRS}
@@ -445,11 +366,7 @@ target_include_directories(
445366
hsv_color_params_collector_node
446367
PRIVATE
447368
include
448-
src/lib/include
449-
src/lib/types/include
450-
src/lib/detectors/include
451-
src/lib/utils/include
452-
src/lib/relations/include
369+
${EOD_INCLUDE}
453370
${OpenCV_INCLUDE_DIRS}
454371
${catkin_INCLUDE_DIRS}
455372
)
@@ -458,11 +375,7 @@ target_include_directories(
458375
hist_color_params_collector_point_node
459376
PRIVATE
460377
include
461-
src/lib/include
462-
src/lib/types/include
463-
src/lib/detectors/include
464-
src/lib/utils/include
465-
src/lib/relations/include
378+
${EOD_INCLUDE}
466379
${OpenCV_INCLUDE_DIRS}
467380
${catkin_INCLUDE_DIRS}
468381
)
@@ -471,11 +384,7 @@ target_include_directories(
471384
hist_color_params_collector_contour_node
472385
PRIVATE
473386
include
474-
src/lib/include
475-
src/lib/types/include
476-
src/lib/detectors/include
477-
src/lib/utils/include
478-
src/lib/relations/include
387+
${EOD_INCLUDE}
479388
${OpenCV_INCLUDE_DIRS}
480389
${catkin_INCLUDE_DIRS}
481390
)
@@ -484,11 +393,7 @@ target_include_directories(
484393
hough_circle_params_collector_node
485394
PRIVATE
486395
include
487-
src/lib/include
488-
src/lib/types/include
489-
src/lib/detectors/include
490-
src/lib/utils/include
491-
src/lib/relations/include
396+
${EOD_INCLUDE}
492397
${OpenCV_INCLUDE_DIRS}
493398
${catkin_INCLUDE_DIRS}
494399
)
@@ -497,11 +402,7 @@ target_include_directories(
497402
blob_params_collector_node
498403
PRIVATE
499404
include
500-
src/lib/include
501-
src/lib/types/include
502-
src/lib/detectors/include
503-
src/lib/utils/include
504-
src/lib/relations/include
405+
${EOD_INCLUDE}
505406
${OpenCV_INCLUDE_DIRS}
506407
${catkin_INCLUDE_DIRS}
507408
)
@@ -510,11 +411,7 @@ target_include_directories(
510411
offline_video
511412
PRIVATE
512413
include
513-
src/lib/include
514-
src/lib/detectors/include
515-
src/lib/relations/include
516-
src/lib/utils/include
517-
src/lib/types/include
414+
${EOD_INCLUDE}
518415
${OpenCV_INCLUDE_DIRS}
519416
${TinyXML_INCLUDE_DIRS}
520417
${catkin_INCLUDE_DIRS}
@@ -524,11 +421,7 @@ target_include_directories(
524421
offline_image
525422
PRIVATE
526423
include
527-
src/lib/include
528-
src/lib/detectors/include
529-
src/lib/relations/include
530-
src/lib/utils/include
531-
src/lib/types/include
424+
${EOD_INCLUDE}
532425
${OpenCV_INCLUDE_DIRS}
533426
${TinyXML_INCLUDE_DIRS}
534427
${catkin_INCLUDE_DIRS}
@@ -565,11 +458,7 @@ if(DLib)
565458
face_dlib_descriptors_extractor
566459
PRIVATE
567460
include
568-
src/lib/include
569-
src/lib/types/include
570-
src/lib/detectors/include
571-
src/lib/utils/include
572-
src/lib/relations/include
461+
${EOD_INCLUDE}
573462
${OpenCV_INCLUDE_DIRS}
574463
${catkin_INCLUDE_DIRS}
575464
)

‎src/lib‎

0 commit comments

Comments
 (0)