From 8b82cc250c01b13e3be8785fdb2f1ec19498d5de Mon Sep 17 00:00:00 2001
From: matlabbe <matlabbe@f169173b-cf89-36c8-b27e-44dbe73f0c83>
Date: Wed, 11 Jun 2014 16:10:58 +0000
Subject: [PATCH] added .settings to ignore when packaging source

git-svn-id: http://rtabmap.googlecode.com/svn/trunk/rtabmap@1348 f169173b-cf89-36c8-b27e-44dbe73f0c83
---
 .cproject      | 17 +++--------------
 .project       |  2 +-
 CMakeLists.txt |  1 +
 3 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/.cproject b/.cproject
index a96dc58b..538dd697 100644
--- a/.cproject
+++ b/.cproject
@@ -25,7 +25,7 @@
 					<folderInfo id="0.1790260204." name="/" resourcePath="">
 						<toolChain id="org.eclipse.cdt.build.core.prefbase.toolchain.379189688" name="No ToolChain" resourceTypeBasedDiscovery="false" superClass="org.eclipse.cdt.build.core.prefbase.toolchain">
 							<targetPlatform binaryParser="org.eclipse.cdt.core.ELF;org.eclipse.cdt.core.MachO;org.eclipse.cdt.core.SOM;org.eclipse.cdt.core.PE;org.eclipse.cdt.core.MachO64" id="org.eclipse.cdt.build.core.prefbase.toolchain.379189688.899900990" name=""/>
-							<builder arguments="-C ${ProjDirPath}/build VERBOSE=true" buildPath="${workspace_loc:/RTAB-Map}" command="make" id="org.eclipse.cdt.build.core.settings.default.builder.1868197384" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>
+							<builder arguments="-j4 -C ${ProjDirPath}/build VERBOSE=true" buildPath="${workspace_loc:/RTAB-Map}" command="make" id="org.eclipse.cdt.build.core.settings.default.builder.1868197384" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>
 							<tool id="org.eclipse.cdt.build.core.settings.holder.libs.45793018" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>
 							<tool id="org.eclipse.cdt.build.core.settings.holder.894008781" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">
 								<option id="org.eclipse.cdt.build.core.settings.holder.undef.incpaths.584706788" name="Undefined Include Paths" superClass="org.eclipse.cdt.build.core.settings.holder.undef.incpaths" valueType="undefIncludePath">
@@ -363,19 +363,8 @@
 	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
 		<project id="CTAB-Map.null.2089313587" name="CTAB-Map"/>
 	</storageModule>
-	<storageModule moduleId="refreshScope" versionNumber="2">
-		<configuration configurationName="Unix">
-			<resource resourceType="PROJECT" workspacePath="/rtabmap"/>
-		</configuration>
-		<configuration configurationName="NMake">
-			<resource resourceType="PROJECT" workspacePath="/rtabmap"/>
-		</configuration>
-		<configuration configurationName="MinGW">
-			<resource resourceType="PROJECT" workspacePath="/rtabmap"/>
-		</configuration>
-		<configuration configurationName="MSVC">
-			<resource resourceType="PROJECT" workspacePath="/rtabmap"/>
-		</configuration>
+	<storageModule moduleId="refreshScope" versionNumber="1">
+		<resource resourceType="PROJECT" workspacePath="/rtabmap"/>
 	</storageModule>
 	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
 	<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
diff --git a/.project b/.project
index 4deb1e63..dcb028bd 100644
--- a/.project
+++ b/.project
@@ -23,7 +23,7 @@
 				</dictionary>
 				<dictionary>
 					<key>org.eclipse.cdt.make.core.buildArguments</key>
-					<value>-C ${ProjDirPath}/build VERBOSE=true</value>
+					<value>-j4 -C ${ProjDirPath}/build VERBOSE=true</value>
 				</dictionary>
 				<dictionary>
 					<key>org.eclipse.cdt.make.core.buildCommand</key>
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a408ebcb..b0df4cff 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -253,6 +253,7 @@ SET(CPACK_PACKAGE_CONTACT "matlabbe@gmail.com")
 
 set(CPACK_SOURCE_IGNORE_FILES 
   "\\\\.svn/" 
+  "\\\\.settings/" 
   "${PROJECT_SOURCE_DIR}/build/[a-zA-Z0-9_]+" 
   "~$" 
   "${PROJECT_SOURCE_DIR}/bin/.*${PROJECT_PREFIX}"