12345qiupeng
/
gtsam
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed unnecessary cpp file in vSLAMexample, added CMake support for examples, used static linking to the real gtsam for tests

release/4.3a0
Alex Cunningham 2012-01-31 05:28:02 +00:00
parent e45514e858
commit 03b4743e7a
7 changed files with 69 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
.cproject
View File

@ -1586,14 +1586,6 @@
<useDefaultCommand>true</useDefaultCommand>
<runAllBuilders>true</runAllBuilders>
</target>
<target name="test" path="build_cmake" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
<buildCommand>make</buildCommand>
<buildArguments>-j2</buildArguments>
<buildTarget>test</buildTarget>
<stopOnError>true</stopOnError>
<useDefaultCommand>true</useDefaultCommand>
<runAllBuilders>true</runAllBuilders>
</target>
<target name="check" path="build_cmake" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
<buildCommand>make</buildCommand>
<buildArguments>-j1</buildArguments>
@ -1842,6 +1834,46 @@
<useDefaultCommand>true</useDefaultCommand>
<runAllBuilders>true</runAllBuilders>
</target>
<target name="inference" path="build_cmake" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
<buildCommand>make</buildCommand>
<buildArguments>-j2</buildArguments>
<buildTarget>inference</buildTarget>
<stopOnError>true</stopOnError>
<useDefaultCommand>true</useDefaultCommand>
<runAllBuilders>true</runAllBuilders>
</target>
<target name="linear" path="build_cmake" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
<buildCommand>make</buildCommand>
<buildArguments>-j2</buildArguments>
<buildTarget>linear</buildTarget>
<stopOnError>true</stopOnError>
<useDefaultCommand>true</useDefaultCommand>
<runAllBuilders>true</runAllBuilders>
</target>
<target name="nonlinear" path="build_cmake" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
<buildCommand>make</buildCommand>
<buildArguments>-j2</buildArguments>
<buildTarget>nonlinear</buildTarget>
<stopOnError>true</stopOnError>
<useDefaultCommand>true</useDefaultCommand>
<runAllBuilders>true</runAllBuilders>
</target>
<target name="slam" path="build_cmake" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
<buildCommand>make</buildCommand>
<buildArguments>-j2</buildArguments>
<buildTarget>slam</buildTarget>
<stopOnError>true</stopOnError>
<useDefaultCommand>true</useDefaultCommand>
<runAllBuilders>true</runAllBuilders>
</target>
<target name="examples" path="build_cmake" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
<buildCommand>make</buildCommand>
<buildArguments>-j2</buildArguments>
<buildTarget>examples</buildTarget>
<stopOnError>true</stopOnError>
<useDefaultCommand>true</useDefaultCommand>
<runAllBuilders>true</runAllBuilders>
</target>
<target name="tests/testDSFVector.run" path="build/gtsam/base" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
<buildCommand>make</buildCommand>
<buildArguments>-j2</buildArguments>

2
CMakeLists.txt
View File

@ -70,4 +70,4 @@ add_subdirectory(tests)
#add_subdirectory(wrap)
# Build examples
#add_subdirectory(examples)
add_subdirectory(examples)

16
examples/CMakeLists.txt
View File

@ -1,8 +1,24 @@
#set(examples_local_libs
# slam
# nonlinear
# linear
# inference
# geometry
# base
# ccolamd
# CppUnitLite
# ${Boost_LIBRARIES}
#)
add_custom_target(examples)
# Build example executables
FILE(GLOB example_srcs "*.cpp")
foreach(example_src ${example_srcs} )
get_filename_component(example_base ${example_src} NAME_WE)
set( example_bin ${example_base} )
message(STATUS "Adding Example ${example_bin}")
add_dependencies(examples ${example_bin})
add_executable(${example_bin} ${example_src})
target_link_libraries(${example_bin} gtsam-static)
endforeach(example_src)

19
examples/vSLAMexample/CMakeLists.txt
View File

@ -1,17 +1,14 @@
# Build vSLAMexample
set ( srcs
Feature2D.cpp
vSLAMutils.cpp
)
add_library(vSLAMexample ${srcs})
add_executable(vISAMexample vISAMexample.cpp)
target_link_libraries(vISAMexample vSLAMexample gtsam-static)
add_executable(vSFMexample vSFMexample.cpp)
target_link_libraries(vSFMexample vSLAMexample gtsam-static)
message(STATUS "Adding Example vISAMexample")
add_executable(vISAMexample vISAMexample.cpp vSLAMutils.cpp)
target_link_libraries(vISAMexample gtsam-static)
add_dependencies(examples vISAMexample)
message(STATUS "Adding Example vSFMexample")
add_executable(vSFMexample vSFMexample.cpp vSLAMutils.cpp)
target_link_libraries(vSFMexample gtsam-static)
add_dependencies(examples vSFMexample)

19
examples/vSLAMexample/Feature2D.cpp
View File

@ -1,19 +0,0 @@
/* ----------------------------------------------------------------------------
* GTSAM Copyright 2010, Georgia Tech Research Corporation,
* Atlanta, Georgia 30332-0415
* All Rights Reserved
* Authors: Frank Dellaert, et al. (see THANKS for the full author list)
* See LICENSE for the license information
* -------------------------------------------------------------------------- */
/**
* @file Feature2D.cpp
* @brief
* @author Duy-Nguyen Ta
*/
#include "Feature2D.h"

4
examples/vSLAMexample/Makefile.am
View File

@ -12,10 +12,10 @@ check_PROGRAMS =
# Examples
noinst_PROGRAMS = vSFMexample
vSFMexample_SOURCES = vSFMexample.cpp Feature2D.cpp vSLAMutils.cpp
vSFMexample_SOURCES = vSFMexample.cpp vSLAMutils.cpp
noinst_PROGRAMS += vISAMexample
vISAMexample_SOURCES = vISAMexample.cpp Feature2D.cpp vSLAMutils.cpp
vISAMexample_SOURCES = vISAMexample.cpp vSLAMutils.cpp
headers += Feature2D.h vSLAMutils.h

16
tests/CMakeLists.txt
View File

@ -2,18 +2,6 @@
add_custom_target(check.tests COMMAND ${CMAKE_CTEST_COMMAND})
add_custom_target(timing.tests)
set(tests_local_libs
slam
nonlinear
linear
inference
geometry
base
ccolamd
CppUnitLite
${Boost_LIBRARIES}
)
# Build tests
file(GLOB tests_srcs "test*.cpp")
foreach(test_src ${tests_srcs})
@ -24,7 +12,7 @@ foreach(test_src ${tests_srcs})
add_dependencies(check.tests ${test_bin})
add_dependencies(check ${test_bin})
add_test(${test_base} ${EXECUTABLE_OUTPUT_PATH}${test_bin})
target_link_libraries(${test_bin} ${tests_local_libs})
target_link_libraries(${test_bin} gtsam-static CppUnitLite ${Boost_LIBRARIES})
add_custom_target(${test_bin}.run ${EXECUTABLE_OUTPUT_PATH}${test_bin} ${ARGN})
endforeach(test_src)
@ -37,7 +25,7 @@ foreach(time_src ${timing_srcs})
add_executable(${time_bin} ${time_src})
add_dependencies(timing.tests ${time_bin})
add_dependencies(timing ${time_bin})
target_link_libraries(${time_bin} ${tests_local_libs})
target_link_libraries(${time_bin} gtsam-static CppUnitLite ${Boost_LIBRARIES})
add_custom_target(${time_bin}.run ${EXECUTABLE_OUTPUT_PATH}${time_bin} ${ARGN})
endforeach(time_src)