Final merge of the pcl-1.0.x branch.

git-svn-id: svn+ssh://svn.pointclouds.org/pcl/tags/pcl-1.0.1@1508 a9d63959-f2ad-4865-b262-bf0e56cfafb6

CMakeLists.txt

@@ -48,7 +48,7 @@ endif(USE_PROJECT_FOLDERS)
 
 include(${PCL_SOURCE_DIR}/cmake/pcl_options.cmake)
 include(${PCL_SOURCE_DIR}/cmake/pcl_utils.cmake)
-set(PCL_VERSION 1.0.0 CACHE STRING "PCL version")
+set(PCL_VERSION 1.0.1 CACHE STRING "PCL version")
 DISSECT_VERSION()
 GET_OS_INFO()
 SET_INSTALL_DIRS()

cmake/merge_cmake_install.py

@@ -0,0 +1,36 @@
+#!/usr/bin/env python
+# file: merge_cmake_install.py
+
+import sys, math
+import fnmatch
+import os
+import shutil
+
+if len(sys.argv) != 2: 
+  # stop the program and print an error message
+  sys.exit("Must provide a cmake binary folder")
+
+base_folder = sys.argv[1]
+
+string_to_remove_debug = "IF(\"${CMAKE_INSTALL_CONFIG_NAME}\" MATCHES \"^([Dd][Ee][Bb][Uu][Gg])$\")"
+string_to_remove_release = "IF(\"${CMAKE_INSTALL_CONFIG_NAME}\" MATCHES \"^([Rr][Ee][Ll][Ee][Aa][Ss][Ee])$\")"
+
+matches = []
+for root, dirnames, filenames in os.walk(base_folder):
+  for filename in fnmatch.filter(filenames, 'cmake_install.cmake'):
+      matches.append(os.path.join(root, filename))
+
+for one_match in matches:
+	#print one_match, "\n"
+	shutil.move( one_match, one_match+"~" )
+	destination= open( one_match, "w" )
+	source= open( one_match+"~", "r" )
+	for line in source:
+		if string_to_remove_debug in line:
+			destination.write( "\n" )
+		elif string_to_remove_release in line:
+			destination.write( "\n" )
+		else:
+			destination.write( line )
+	source.close()
+	destination.close()

common/CMakeLists.txt

@@ -3,7 +3,7 @@ set(SUBSYS_DESC "Point cloud common library")
 set(SUBSYS_DEPS)
 
 set(build TRUE)
-PCL_SUBSYS_OPTION(build ${SUBSYS_NAME} ${SUBSYS_DESC} ON ${SUBSYS_DEPS})
+PCL_SUBSYS_OPTION(build ${SUBSYS_NAME} ${SUBSYS_DESC} ON)
 PCL_SUBSYS_DEPEND(build ${SUBSYS_NAME} ${SUBSYS_DEPS})
 
 if(build)

io/src/pcd_io.cpp

@@ -796,7 +796,7 @@ pcl::PCDWriter::writeASCII (const std::string &file_name, const sensor_msgs::Poi
     std::string result = stream.str ();
     boost::trim (result);
     stream.str ("");
-    fs << result << std::endl;
+    fs << result << "\n";
   }
   fs.close ();              // Close file
   return (0);