Skip to content

Commit 8b82cc2

Browse files
author
matlabbe
committed
added .settings to ignore when packaging source
git-svn-id: http://rtabmap.googlecode.com/svn/trunk/rtabmap@1348 f169173b-cf89-36c8-b27e-44dbe73f0c83
1 parent 42862c9 commit 8b82cc2

File tree

3 files changed

+5
-15
lines changed

3 files changed

+5
-15
lines changed

Diff for: .cproject

+3-14
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<folderInfo id="0.1790260204." name="/" resourcePath="">
2626
<toolChain id="org.eclipse.cdt.build.core.prefbase.toolchain.379189688" name="No ToolChain" resourceTypeBasedDiscovery="false" superClass="org.eclipse.cdt.build.core.prefbase.toolchain">
2727
<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=""/>
28-
<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"/>
28+
<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"/>
2929
<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"/>
3030
<tool id="org.eclipse.cdt.build.core.settings.holder.894008781" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">
3131
<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 @@
363363
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
364364
<project id="CTAB-Map.null.2089313587" name="CTAB-Map"/>
365365
</storageModule>
366-
<storageModule moduleId="refreshScope" versionNumber="2">
367-
<configuration configurationName="Unix">
368-
<resource resourceType="PROJECT" workspacePath="/rtabmap"/>
369-
</configuration>
370-
<configuration configurationName="NMake">
371-
<resource resourceType="PROJECT" workspacePath="/rtabmap"/>
372-
</configuration>
373-
<configuration configurationName="MinGW">
374-
<resource resourceType="PROJECT" workspacePath="/rtabmap"/>
375-
</configuration>
376-
<configuration configurationName="MSVC">
377-
<resource resourceType="PROJECT" workspacePath="/rtabmap"/>
378-
</configuration>
366+
<storageModule moduleId="refreshScope" versionNumber="1">
367+
<resource resourceType="PROJECT" workspacePath="/rtabmap"/>
379368
</storageModule>
380369
<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
381370
<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>

Diff for: .project

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
</dictionary>
2424
<dictionary>
2525
<key>org.eclipse.cdt.make.core.buildArguments</key>
26-
<value>-C ${ProjDirPath}/build VERBOSE=true</value>
26+
<value>-j4 -C ${ProjDirPath}/build VERBOSE=true</value>
2727
</dictionary>
2828
<dictionary>
2929
<key>org.eclipse.cdt.make.core.buildCommand</key>

Diff for: CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -253,6 +253,7 @@ SET(CPACK_PACKAGE_CONTACT "[email protected]")
253253

254254
set(CPACK_SOURCE_IGNORE_FILES
255255
"\\\\.svn/"
256+
"\\\\.settings/"
256257
"${PROJECT_SOURCE_DIR}/build/[a-zA-Z0-9_]+"
257258
"~$"
258259
"${PROJECT_SOURCE_DIR}/bin/.*${PROJECT_PREFIX}"

0 commit comments

Comments
 (0)