fixed missing binaries from install target, cleanup of "make dist" ta…

…rget

CMakeLists.txt

@@ -16,6 +16,8 @@ IF (NOT WIN32)
 	  COMMAND svn export --force -q "${PROJECT_SOURCE_DIR}" "${DIST_DIR}/${PROJECT_NAME}" 
 	  COMMAND tar -czf "${CMAKE_BINARY_DIR}/${PKG_NAME}" -C "${DIST_DIR}" --exclude=".hidden" "${PROJECT_NAME}"
 	    WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}"
+	  # cleanup so that there is no copy in the source dir
+	  COMMAND rm -rf "${DIST_DIR}"
 	)
 
 	# also build subproject's dist for completeness

octomap/CMakeLists.txt

@@ -122,7 +122,7 @@ IF(DOXYGEN_FOUND)
     COMMENT "Generating documentation (Doxygen)...")
 ENDIF(DOXYGEN_FOUND)
 
-# make package release from source
+# make package release from source (must be done on the SVN source tree)
 IF (NOT WIN32)
 	SET(OCTOMAP_PKG_NAME "${PROJECT_NAME}-${OCTOMAP_VERSION}.tar.gz")
 	SET(DIST_DIR "${CMAKE_BINARY_DIR}/dist-${PROJECT_NAME}")
@@ -132,6 +132,8 @@ IF (NOT WIN32)
 		COMMAND svn export --force -q "${PROJECT_SOURCE_DIR}" "${DIST_DIR}/${PROJECT_NAME}" 
 		COMMAND tar -czf "${CMAKE_BINARY_DIR}/${OCTOMAP_PKG_NAME}" -C "${DIST_DIR}" --exclude=".hidden" "${PROJECT_NAME}"
 			WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}"
+		# cleanup so that there is no copy in the source dir
+		COMMAND rm -rf "${DIST_DIR}"
 	)
 ENDIF()
 

octomap/README.txt

@@ -2,10 +2,11 @@
 Octomap
 - A probabilistic, flexible, and compact 3D mapping library for robotic systems.
 
-Authors: K. M. Wurm, A. Hornung, University of Freiburg, Copyright (C) 2009-2011.
+Authors: K. M. Wurm, A. Hornung, University of Freiburg, Copyright (C) 2009-2012.
 http://octomap.sourceforge.net/
 
 Further Contributors:
+C. Sprunk, University of Freiburg
 J. Mueller, University of Freiburg
 S. Osswald, University of Freiburg
 R. Schmitt, University of Freiburg

octomap/src/CMakeLists.txt

@@ -60,6 +60,8 @@ install(TARGETS
 	log2graph
 	binvox2bt
 	bt2vrml
+	edit_octree
+	convert_octree
 	${INSTALL_TARGETS_DEFAULT_ARGS}
 )
 

octovis/CMakeLists.txt

@@ -114,6 +114,8 @@ IF(BUILD_VIEWER)
 		  COMMAND svn export --force -q "${PROJECT_SOURCE_DIR}" "${DIST_DIR}/${PROJECT_NAME}" 
 		  COMMAND tar -czf "${CMAKE_BINARY_DIR}/${OCTOVIS_PKG_NAME}" -C "${DIST_DIR}" --exclude=".hidden" "${PROJECT_NAME}"
 		    WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}"
+		  # cleanup so that there is no copy in the source dir
+	      COMMAND rm -rf "${DIST_DIR}"
 		)
 	ENDIF ()