Move io_ply to actual submodule.

larshg · larshg · commit 614f196e0447 · 2024-02-11T22:47:34.000+01:00
diff --git a/io/CMakeLists.txt b/io/CMakeLists.txt
@@ -1,38 +1,6 @@
-#Helper library
-set(SUBSYS_NAME io_ply)
-set(SUBSYS_DESC "Point cloud IO ply library")
-set(SUBSYS_DEPS common)
-set(SUBSYS_EXT_DEPS boost eigen3)
-
-set(PLY_SOURCES src/ply/ply_parser.cpp)
-set(PLY_INCLUDES
-  "include/pcl/io/ply/byte_order.h"
-  "include/pcl/io/ply/io_operators.h"
-  "include/pcl/io/ply/ply.h"
-  "include/pcl/io/ply/ply_parser.h"
-)
-
-PCL_SUBSYS_OPTION(build "${SUBSYS_NAME}" "${SUBSYS_DESC}" ON)
-PCL_SUBSYS_DEPEND(build NAME ${SUBSYS_NAME} DEPS ${SUBSYS_DEPS} EXT_DEPS ${EXT_DEPS})
-
-if(build)
-  set(LIB_NAME "pcl_${SUBSYS_NAME}")
-  PCL_ADD_LIBRARY(${LIB_NAME} COMPONENT ${SUBSYS_NAME} SOURCES ${PLY_SOURCES} ${PLY_INCLUDES})
-  if(MINGW)
-    # libws2_32 isn't added by default for MinGW
-    target_link_libraries(${LIB_NAME} ws2_32)
-  endif()
-  PCL_ADD_INCLUDES("${SUBSYS_NAME}" "${SUBSYS_NAME}/ply" ${PLY_INCLUDES})
-  
-  target_link_libraries(${LIB_NAME} pcl_common Boost::boost)
-endif()
-unset(build)
-
-# Main IO Library
-
 set(SUBSYS_NAME io)
 set(SUBSYS_DESC "Point cloud IO library")
-set(SUBSYS_DEPS common octree)
+set(SUBSYS_DEPS common io_ply octree)
 set(SUBSYS_EXT_DEPS boost eigen3)
 
 PCL_SUBSYS_OPTION(build "${SUBSYS_NAME}" "${SUBSYS_DESC}" ON)
diff --git a/io/include/pcl/io/ply_io.h b/io/include/pcl/io/ply_io.h
@@ -43,7 +43,7 @@
 #include <pcl/pcl_macros.h>
 #include <pcl/common/io.h> // for copyPointCloud
 #include <pcl/io/file_io.h>
-#include <pcl/io/ply/ply_parser.h>
+#include <pcl/io_ply/ply_parser.h>
 #include <pcl/PolygonMesh.h>
 
 #include <sstream>
diff --git a/io_ply/CMakeLists.txt b/io_ply/CMakeLists.txt
@@ -0,0 +1,30 @@
+#Helper library
+set(SUBSYS_NAME io_ply)
+set(SUBSYS_DESC "Point cloud IO ply library")
+set(SUBSYS_DEPS common)
+set(SUBSYS_EXT_DEPS boost eigen3)
+
+set(PLY_SOURCES src/ply_parser.cpp)
+set(PLY_INCLUDES
+  "include/pcl/io_ply/byte_order.h"
+  "include/pcl/io_ply/io_operators.h"
+  "include/pcl/io_ply/ply.h"
+  "include/pcl/io_ply/ply_parser.h"
+)
+
+PCL_SUBSYS_OPTION(build "${SUBSYS_NAME}" "${SUBSYS_DESC}" ON)
+PCL_SUBSYS_DEPEND(build NAME ${SUBSYS_NAME} DEPS ${SUBSYS_DEPS} EXT_DEPS ${EXT_DEPS})
+
+if(NOT build)
+  return()
+endif()
+
+set(LIB_NAME "pcl_${SUBSYS_NAME}")
+PCL_ADD_LIBRARY(${LIB_NAME} COMPONENT ${SUBSYS_NAME} SOURCES ${PLY_SOURCES} ${PLY_INCLUDES})
+if(MINGW)
+  # libws2_32 isn't added by default for MinGW
+  target_link_libraries(${LIB_NAME} ws2_32)
+endif()
+PCL_ADD_INCLUDES("${SUBSYS_NAME}" "${SUBSYS_NAME}/ply" ${PLY_INCLUDES})
+  
+target_link_libraries(${LIB_NAME} pcl_common Boost::boost)
diff --git a/io_ply/include/pcl/io_ply/byte_order.h b/io_ply/include/pcl/io_ply/byte_order.h
diff --git a/io_ply/include/pcl/io_ply/io_operators.h b/io_ply/include/pcl/io_ply/io_operators.h
diff --git a/io_ply/include/pcl/io_ply/ply.h b/io_ply/include/pcl/io_ply/ply.h
@@ -40,7 +40,7 @@
 
 #pragma once
 
-#include <pcl/io/ply/byte_order.h>
+#include <pcl/io_ply/byte_order.h>
 #include <cstdint> // for int8_t, int16_t, ...
 
 /** \file ply.h contains standard typedefs and generic type traits
diff --git a/io_ply/include/pcl/io_ply/ply_parser.h b/io_ply/include/pcl/io_ply/ply_parser.h
@@ -40,8 +40,8 @@
 
 #pragma once
 
-#include <pcl/io/ply/ply.h>
-#include <pcl/io/ply/io_operators.h>
+#include <pcl/io_ply/ply.h>
+#include <pcl/io_ply/io_operators.h>
 #include <pcl/pcl_macros.h>
 
 #include <istream>
diff --git a/io_ply/src/ply_parser.cpp b/io_ply/src/ply_parser.cpp
@@ -38,7 +38,7 @@
  *
  */
 
-#include <pcl/io/ply/ply_parser.h>
+#include <pcl/io_ply/ply_parser.h>
 
 #include <algorithm> // for find_if
 #include <fstream> // for ifstream
diff --git a/tools/ply2obj.cpp b/tools/ply2obj.cpp
@@ -38,7 +38,7 @@
  *
  */
 
-#include <pcl/io/ply/ply_parser.h>
+#include <pcl/io_ply/ply_parser.h>
 
 #include <cstdlib>
 #include <cstring>
diff --git a/tools/ply2ply.cpp b/tools/ply2ply.cpp
@@ -37,7 +37,7 @@
  *
  */
 
-#include <pcl/io/ply/ply_parser.h>
+#include <pcl/io_ply/ply_parser.h>
 
 #include <cstdlib>
 #include <cstring>
diff --git a/tools/ply2raw.cpp b/tools/ply2raw.cpp
@@ -37,7 +37,7 @@
  *
  */
 
-#include <pcl/io/ply/ply_parser.h>
+#include <pcl/io_ply/ply_parser.h>
 
 #include <cstdlib>
 #include <cstring>

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@`
`38`	`38`	`*`
`39`	`39`	`*/`
`40`	`40`
`41`		`-#include <pcl/io/ply/ply_parser.h>`
	`41`	`+#include <pcl/io_ply/ply_parser.h>`
`42`	`42`
`43`	`43`	`#include <algorithm> // for find_if`
`44`	`44`	`#include <fstream> // for ifstream`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@`
`37`	`37`	`*`
`38`	`38`	`*/`
`39`	`39`
`40`		`-#include <pcl/io/ply/ply_parser.h>`
	`40`	`+#include <pcl/io_ply/ply_parser.h>`
`41`	`41`
`42`	`42`	`#include <cstdlib>`
`43`	`43`	`#include <cstring>`