switching to a ROS-like directory structure.

please use something like: #include <octomap/octomap.h> instead of: #include "octomap.h"
FrankXie05 · Jan 20, 2011 · fdb4e94 · fdb4e94
1 parent e3cc881
commit fdb4e94
Show file tree

Hide file tree

Showing 44 changed files with 56 additions and 52 deletions.
diff --git a/src/CMakeLists.txt → CMakeLists.txt b/src/CMakeLists.txt → CMakeLists.txt
@@ -3,7 +3,7 @@ PROJECT( octomap )
 
 # version (e.g. for packaging)
 set(V_MAJOR 0)
-set(V_MINOR 8)
+set(V_MINOR 9)
 set(V_PATCH 0)
 
 # get rid of a useless warning:
@@ -25,7 +25,7 @@ SET (CMAKE_CXX_FLAGS_RELEASE "-O3 -funroll-loops -DNDEBUG -O3 -msse3 -mssse3")
 SET (CMAKE_CXX_FLAGS_DEBUG "-O0 -g")
 
 # Set output directories for libraries and executables
-SET( BASE_DIR ${CMAKE_SOURCE_DIR}/.. )
+SET( BASE_DIR ${CMAKE_SOURCE_DIR} )
 SET( CMAKE_LIBRARY_OUTPUT_DIRECTORY ${BASE_DIR}/lib )
 SET( CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${BASE_DIR}/lib )
 SET( CMAKE_RUNTIME_OUTPUT_DIRECTORY ${BASE_DIR}/bin )
@@ -36,9 +36,9 @@ MESSAGE ("\n")
 MESSAGE (STATUS "Building as ${CMAKE_BUILD_TYPE}")
 MESSAGE ("\n")
 
-# Main include dir is the "src" dir
 INCLUDE_DIRECTORIES(
-  ${CMAKE_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/include
+  ${CMAKE_SOURCE_DIR}/src  # for hxx files
 )
 
 
@@ -55,14 +55,19 @@ set(INSTALL_TARGETS_DEFAULT_ARGS
 	ARCHIVE DESTINATION lib
 )
 
-ADD_SUBDIRECTORY( octomath )
-ADD_SUBDIRECTORY( octomap )
+ADD_SUBDIRECTORY( src/octomap/math )
+ADD_SUBDIRECTORY( src/octomap )
 
 # installation for external targets:
-install(PROGRAMS "extern/binvox/binvox" DESTINATION bin)
-install(PROGRAMS "extern/binvox/binvox64" DESTINATION bin)
-install(PROGRAMS "extern/binvox/viewvox" DESTINATION bin)
-install(PROGRAMS "extern/binvox/viewvox64" DESTINATION bin)
+install(PROGRAMS "src/extern/binvox/binvox" DESTINATION bin)
+install(PROGRAMS "src/extern/binvox/binvox64" DESTINATION bin)
+install(PROGRAMS "src/extern/binvox/viewvox" DESTINATION bin)
+install(PROGRAMS "src/extern/binvox/viewvox64" DESTINATION bin)
+
+file(GLOB octomap_HDRS ${CMAKE_SOURCE_DIR}/include/octomap/*.h)
+install(FILES ${octomap_HDRS}	DESTINATION include/octomap)
+file(GLOB octomap_math_HDRS ${CMAKE_SOURCE_DIR}/include/octomap/math/*.h)
+install(FILES ${octomap_math_HDRS}	DESTINATION include/octomap/math)
 
 
 # Documentation 
@@ -102,7 +107,7 @@ ENDIF()
 IF(BUILD_VIEWER)
   MESSAGE(STATUS "\n")
   MESSAGE(STATUS "viewer octovis will be build")
-  ADD_SUBDIRECTORY( octovis ) 
+  ADD_SUBDIRECTORY( src/octovis ) 
 ELSE()
     MESSAGE ( "Unfortunately, the viewer (octovis) can not be build.")
     MESSAGE ( "See README.txt or http://octomap.sf.net for further information.\n")

diff --git a/src/examples/scan.dat.bz2 → data/scan.dat.bz2 b/src/examples/scan.dat.bz2 → data/scan.dat.bz2
diff --git a/src/octomap/CountingOcTree.h → include/octomap/CountingOcTree.h b/src/octomap/CountingOcTree.h → include/octomap/CountingOcTree.h
diff --git a/src/octomap/OcTree.h → include/octomap/OcTree.h b/src/octomap/OcTree.h → include/octomap/OcTree.h
diff --git a/src/octomap/OcTreeBase.h → include/octomap/OcTreeBase.h b/src/octomap/OcTreeBase.h → include/octomap/OcTreeBase.h
@@ -301,6 +301,6 @@ namespace octomap {
 
 }
 
-#include "OcTreeBase.hxx"
+#include <octomap/OcTreeBase.hxx>
 
 #endif
diff --git a/src/octomap/OcTreeBaseSE.h → include/octomap/OcTreeBaseSE.h b/src/octomap/OcTreeBaseSE.h → include/octomap/OcTreeBaseSE.h
diff --git a/src/octomap/OcTreeDataNode.h → include/octomap/OcTreeDataNode.h b/src/octomap/OcTreeDataNode.h → include/octomap/OcTreeDataNode.h
@@ -145,6 +145,6 @@ namespace octomap {
 
 } // end namespace
 
-#include "OcTreeDataNode.hxx"
+#include "octomap/OcTreeDataNode.hxx"
 
 #endif
diff --git a/src/octomap/OcTreeFileIO.h → include/octomap/OcTreeFileIO.h b/src/octomap/OcTreeFileIO.h → include/octomap/OcTreeFileIO.h
@@ -103,6 +103,6 @@ namespace octomap {
   };
 }
 
-#include "OcTreeFileIO.hxx"
+#include "octomap/OcTreeFileIO.hxx"
 
 #endif
diff --git a/src/octomap/OcTreeKey.h → include/octomap/OcTreeKey.h b/src/octomap/OcTreeKey.h → include/octomap/OcTreeKey.h
diff --git a/src/octomap/OcTreeLUT.h → include/octomap/OcTreeLUT.h b/src/octomap/OcTreeLUT.h → include/octomap/OcTreeLUT.h
diff --git a/src/octomap/OcTreeLUTdefs.h → include/octomap/OcTreeLUTdefs.h b/src/octomap/OcTreeLUTdefs.h → include/octomap/OcTreeLUTdefs.h
diff --git a/src/octomap/OcTreeLabeled.h → include/octomap/OcTreeLabeled.h b/src/octomap/OcTreeLabeled.h → include/octomap/OcTreeLabeled.h
diff --git a/src/octomap/OcTreeNode.h → include/octomap/OcTreeNode.h b/src/octomap/OcTreeNode.h → include/octomap/OcTreeNode.h
diff --git a/src/octomap/OcTreeNodeLabeled.h → include/octomap/OcTreeNodeLabeled.h b/src/octomap/OcTreeNodeLabeled.h → include/octomap/OcTreeNodeLabeled.h
diff --git a/src/octomap/OccupancyOcTreeBase.h → include/octomap/OccupancyOcTreeBase.h b/src/octomap/OccupancyOcTreeBase.h → include/octomap/OccupancyOcTreeBase.h
@@ -275,6 +275,6 @@ namespace octomap {
 
 }
 
-#include "OccupancyOcTreeBase.hxx"
+#include "octomap/OccupancyOcTreeBase.hxx"
 
 #endif
diff --git a/src/octomap/Pointcloud.h → include/octomap/Pointcloud.h b/src/octomap/Pointcloud.h → include/octomap/Pointcloud.h
diff --git a/src/octomap/ScanGraph.h → include/octomap/ScanGraph.h b/src/octomap/ScanGraph.h → include/octomap/ScanGraph.h
diff --git a/src/octomath/Pose6D.h → include/octomap/math/Pose6D.h b/src/octomath/Pose6D.h → include/octomap/math/Pose6D.h
diff --git a/src/octomath/Quaternion.h → include/octomap/math/Quaternion.h b/src/octomath/Quaternion.h → include/octomap/math/Quaternion.h
diff --git a/src/octomath/Utils.h → include/octomap/math/Utils.h b/src/octomath/Utils.h → include/octomap/math/Utils.h
diff --git a/src/octomath/Vector3.h → include/octomap/math/Vector3.h b/src/octomath/Vector3.h → include/octomap/math/Vector3.h
diff --git a/src/octomap/octomap.h → include/octomap/octomap.h b/src/octomap/octomap.h → include/octomap/octomap.h
diff --git a/src/octomap/octomap_types.h → include/octomap/octomap_types.h b/src/octomap/octomap_types.h → include/octomap/octomap_types.h
@@ -44,8 +44,8 @@
 #include <list>
 
 
-#include <octomath/Vector3.h>
-#include <octomath/Pose6D.h>
+#include <octomap/math/Vector3.h>
+#include <octomap/math/Pose6D.h>
 
 namespace octomap {
 

diff --git a/src/octomap/CMakeLists.txt b/src/octomap/CMakeLists.txt
@@ -43,9 +43,8 @@ TARGET_LINK_LIBRARIES(test_raycasting octomap)
 
 # installation:
 # store all header files to install:
-file(GLOB octomap_HDRS *.h *.hxx *.hpp)
-
-install(FILES ${octomap_HDRS}	DESTINATION include/octomap)
+file(GLOB octomap_impl_HDRS *.h *.hxx *.hpp)
+install(FILES ${octomap_impl_HDRS} DESTINATION include/octomap)
 
 install(TARGETS octomap 
 	graph2tree

diff --git a/src/octomap/CountingOcTree.cpp b/src/octomap/CountingOcTree.cpp
@@ -38,7 +38,7 @@
  */
 
 #include <cassert>
-#include "CountingOcTree.h"
+#include <octomap/CountingOcTree.h>
 
 namespace octomap {
 

diff --git a/src/octomap/OcTree.cpp b/src/octomap/OcTree.cpp
@@ -41,8 +41,8 @@
 #include <fstream>
 #include <stdlib.h>
 
-#include "OcTree.h"
-#include "CountingOcTree.h"
+#include <octomap/OcTree.h>
+#include <octomap/CountingOcTree.h>
 
 
 namespace octomap {

diff --git a/src/octomap/OcTreeLUT.cpp b/src/octomap/OcTreeLUT.cpp
@@ -40,7 +40,7 @@
 
 #include <list>
 #include <queue>
-#include "OcTreeLUT.h"
+#include <octomap/OcTreeLUT.h>
 
 namespace octomap {
 

diff --git a/src/octomap/OcTreeLabeled.cpp b/src/octomap/OcTreeLabeled.cpp
@@ -39,8 +39,8 @@
 
 #include <fstream>
 
-#include "OcTree.h"
-#include "OcTreeLabeled.h"
+#include <octomap/OcTree.h>
+#include <octomap/OcTreeLabeled.h>
 
 
 namespace octomap {

diff --git a/src/octomap/OcTreeNode.cpp b/src/octomap/OcTreeNode.cpp
@@ -43,7 +43,7 @@
 #include <fstream>
 #include <stdlib.h>
 
-#include "OcTreeNode.h"
+#include <octomap/OcTreeNode.h>
 
 namespace octomap {
 

diff --git a/src/octomap/OcTreeNodeLabeled.cpp b/src/octomap/OcTreeNodeLabeled.cpp
@@ -41,7 +41,7 @@
 #include <cassert>
 #include <fstream> // REMOVE
 
-#include "OcTreeNodeLabeled.h"
+#include <octomap/OcTreeNodeLabeled.h>
 
 namespace octomap {
 

diff --git a/src/octomap/OccupancyOcTreeBase.hxx b/src/octomap/OccupancyOcTreeBase.hxx
@@ -37,7 +37,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "CountingOcTree.h"
+#include <octomap/CountingOcTree.h>
 
 
 namespace octomap {

diff --git a/src/octomap/Pointcloud.cpp b/src/octomap/Pointcloud.cpp
@@ -37,7 +37,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "Pointcloud.h"
+#include <octomap/Pointcloud.h>
 #include <ext/algorithm>
 #include <list>
 #include <fstream>

diff --git a/src/octomap/ScanGraph.cpp b/src/octomap/ScanGraph.cpp
@@ -42,8 +42,8 @@
 #include <sstream>
 #include <stdlib.h>
 
-#include <octomath/Pose6D.h>
-#include "ScanGraph.h"
+#include <octomap/math/Pose6D.h>
+#include <octomap/ScanGraph.h>
 
 namespace octomap {
 

diff --git a/src/octomap/bt2vrml.cpp b/src/octomap/bt2vrml.cpp
@@ -37,7 +37,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "octomap.h"
+#include <octomap/octomap.h>
 #include <fstream>
 #include <iostream>
 #include <string.h>

diff --git a/src/octomap/graph2tree.cpp b/src/octomap/graph2tree.cpp
@@ -37,8 +37,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "octomap.h"
-#include "OcTreeFileIO.h"
+#include <octomap/octomap.h>
+#include <octomap/OcTreeFileIO.h>
 #include <string.h>
 #include <stdlib.h>
 #include <sys/time.h>

diff --git a/src/octomap/labeled_demo.cpp b/src/octomap/labeled_demo.cpp
@@ -37,8 +37,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "octomap.h"
-#include "OcTreeLabeled.h"
+#include <octomap/octomap.h>
+#include <octomap/OcTreeLabeled.h>
 
 using namespace std;
 using namespace octomap;

diff --git a/src/octomap/log2graph.cpp b/src/octomap/log2graph.cpp
@@ -37,7 +37,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "octomap.h"
+#include <octomap/octomap.h>
 #include <string.h>
 #include <stdlib.h>
 

diff --git a/src/octomath/CMakeLists.txt → src/octomap/math/CMakeLists.txt b/src/octomath/CMakeLists.txt → src/octomap/math/CMakeLists.txt
diff --git a/src/octomath/Pose6D.cpp → src/octomap/math/Pose6D.cpp b/src/octomath/Pose6D.cpp → src/octomap/math/Pose6D.cpp
@@ -37,7 +37,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "Pose6D.h"
+#include <octomap/math/Pose6D.h>
 #include <math.h>
 
 namespace octomath {

diff --git a/src/octomath/Quaternion.cpp → src/octomap/math/Quaternion.cpp b/src/octomath/Quaternion.cpp → src/octomap/math/Quaternion.cpp
@@ -37,12 +37,12 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "Quaternion.h"
-#include "Vector3.h"
+#include <octomap/math/Vector3.h>
+#include <octomap/math/Quaternion.h>
+#include <octomap/math/Utils.h>
 
 #include <cassert>
 #include <math.h>
-#include "Utils.h"
 
 
 // used from Vector: norm2, unit, *

diff --git a/src/octomath/Vector3.cpp → src/octomap/math/Vector3.cpp b/src/octomath/Vector3.cpp → src/octomap/math/Vector3.cpp
@@ -37,7 +37,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "Vector3.h"
+#include <octomap/math/Vector3.h>
 #include <cassert>
 #include <math.h>
 #include <string.h>

diff --git a/src/octomap/simple.cpp b/src/octomap/simple.cpp
@@ -37,8 +37,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "octomap.h"
-#include "OcTreeLabeled.h"
+#include <octomap/octomap.h>
+#include <octomap/OcTreeLabeled.h>
 
 using namespace std;
 using namespace octomap;

diff --git a/src/octomap/test_raycasting.cpp b/src/octomap/test_raycasting.cpp
@@ -1,7 +1,7 @@
 
 #include <stdio.h>
-#include "octomap.h"
-#include <octomath/Utils.h>
+#include <octomap/octomap.h>
+#include <octomap/math/Utils.h>
 
 using namespace std;
 using namespace octomap;

diff --git a/src/octovis/CMakeLists.txt b/src/octovis/CMakeLists.txt
@@ -79,13 +79,13 @@ target_link_libraries(octovis
 )
 
 
-#installation:
-# store all header files to install:
-file(GLOB octovis_HDRS  *.h *.hxx *.hpp)
+# #installation:
+# # store all header files to install:
+# file(GLOB octovis_HDRS  *.h *.hxx *.hpp)
 
-install(FILES ${octovis_HDRS}	DESTINATION include/octovis)
+# install(FILES ${octovis_HDRS}	DESTINATION include/octovis)
 
 install(TARGETS octovis
-	octovis_library
+	# octovis_library
 	${INSTALL_TARGETS_DEFAULT_ARGS}
 )
-Original file line number
+Diff line change
@@ Expand Up / @@ -301,6 +301,6 @@ namespace octomap { @@
     }
-    #include "OcTreeBase.hxx"
+    #include <octomap/OcTreeBase.hxx>
     #endif