Add bundle/framework apps to the compound apps target.

PointCloudLibrary · Dec 3, 2018 · dbee05a · dbee05a
1 parent 3a70d43
commit dbee05a
Show file tree

Hide file tree

Showing 11 changed files with 23 additions and 14 deletions.
diff --git a/apps/3d_rec_framework/CMakeLists.txt b/apps/3d_rec_framework/CMakeLists.txt
@@ -100,4 +100,11 @@ if(build)
 
   add_subdirectory(tools)
 
+  pcl_add_executable(pcl_local_or_mian ${SUBSUBSYS_NAME} src/tools/local_recognition_mian_dataset.cpp)
+  target_link_libraries(pcl_local_or_mian pcl_apps pcl_3d_rec_framework pcl_recognition pcl_common pcl_io pcl_filters pcl_visualization pcl_segmentation pcl_sample_consensus pcl_surface pcl_keypoints)
+
+  # Add to the compound apps target
+  string(TOUPPER ${SUBSUBSYS_NAME} SUBSUBSYS_NAME_UPPER)
+  list(APPEND PCL_APPS_ALL_TARGETS ${PCL_${SUBSUBSYS_NAME_UPPER}_ALL_TARGETS})
+  set(PCL_APPS_ALL_TARGETS ${PCL_APPS_ALL_TARGETS} PARENT_SCOPE)
 endif()
diff --git a/.../tools/apps/src/global_classification.cpp → ...ework/src/tools/global_classification.cpp b/.../tools/apps/src/global_classification.cpp → ...ework/src/tools/global_classification.cpp
diff --git a/...ps/src/local_recognition_mian_dataset.cpp → .../tools/local_recognition_mian_dataset.cpp b/...ps/src/local_recognition_mian_dataset.cpp → .../tools/local_recognition_mian_dataset.cpp
diff --git a/apps/3d_rec_framework/tools/CMakeLists.txt b/apps/3d_rec_framework/tools/CMakeLists.txt
diff --git a/apps/3d_rec_framework/tools/apps/CMakeLists.txt b/apps/3d_rec_framework/tools/apps/CMakeLists.txt
diff --git a/apps/cloud_composer/CMakeLists.txt b/apps/cloud_composer/CMakeLists.txt
@@ -195,4 +195,7 @@ if(build)
     set(VSP_HEADERS "include/pcl/${SUBSYS_NAME}/${SUBSUBSYS_NAME}/tools/supervoxels.h")
     define_composer_tool (supervoxels "${VSP_SOURCES}" "${VSP_HEADERS}" "${VSP_DEPS}")
 
+    # Add to the compound apps target
+    list(APPEND PCL_APPS_ALL_TARGETS ${EXE_NAME})
+    set(PCL_APPS_ALL_TARGETS ${PCL_APPS_ALL_TARGETS} PARENT_SCOPE)
 endif()
diff --git a/apps/in_hand_scanner/CMakeLists.txt b/apps/in_hand_scanner/CMakeLists.txt
@@ -137,4 +137,7 @@ if(build)
   pcl_add_executable_opt_bundle(pcl_offline_integration "${SUBSUBSYS_NAME}" ${OI_SRCS} ${OI_INCS})
   target_link_libraries(pcl_offline_integration ${SUBSUBSYS_LIBS} ${OPENGL_LIBRARIES} ${QT_LIBRARIES})
 
+  # Add to the compound apps target
+  list(APPEND PCL_APPS_ALL_TARGETS ${PCL_IN_HAND_SCANNER_ALL_TARGETS})
+  set(PCL_APPS_ALL_TARGETS ${PCL_APPS_ALL_TARGETS} PARENT_SCOPE)
 endif()
diff --git a/apps/modeler/CMakeLists.txt b/apps/modeler/CMakeLists.txt
@@ -139,6 +139,8 @@ if(build)
 
   PCL_MAKE_PKGCONFIG("${EXE_NAME}" "${SUBSUBSYS_NAME}" "${SUBSUBSYS_DESC}" "" "" "" "" "")
 
-  add_subdirectory(tools)
+  # Add to the compound apps target
+  list(APPEND PCL_APPS_ALL_TARGETS ${EXE_NAME})
+  set(PCL_APPS_ALL_TARGETS ${PCL_APPS_ALL_TARGETS} PARENT_SCOPE)
 
 endif()
diff --git a/apps/modeler/tools/CMakeLists.txt b/apps/modeler/tools/CMakeLists.txt
diff --git a/apps/optronic_viewer/CMakeLists.txt b/apps/optronic_viewer/CMakeLists.txt
@@ -105,4 +105,7 @@ if(build)
 
   PCL_MAKE_PKGCONFIG("${EXE_NAME}" "${SUBSUBSYS_NAME}" "${SUBSUBSYS_DESC}" "" "" "" "" "")
 
+  # Add to the compound apps target
+  list(APPEND PCL_APPS_ALL_TARGETS ${EXE_NAME})
+  set(PCL_APPS_ALL_TARGETS ${PCL_APPS_ALL_TARGETS} PARENT_SCOPE)
 endif()
diff --git a/apps/point_cloud_editor/CMakeLists.txt b/apps/point_cloud_editor/CMakeLists.txt
@@ -116,4 +116,8 @@ if(BUILD)
 
   PCL_ADD_INCLUDES("${SUBSUBSYS_NAME}" "${SUBSYS_NAME}/${SUBSUBSYS_NAME}" ${INCS})
   PCL_MAKE_PKGCONFIG("${EXE_NAME}" "${SUBSUBSYS_NAME}" "${SUBSUBSYS_DESC}" "" "" "" "" "")
+
+  # Add to the compound apps target
+  list(APPEND PCL_APPS_ALL_TARGETS ${EXE_NAME})
+  set(PCL_APPS_ALL_TARGETS ${PCL_APPS_ALL_TARGETS} PARENT_SCOPE)
 endif()