Modified cmake

This commit is contained in:
edgarriba 2014-08-07 11:33:32 +02:00
parent f1b6809eee
commit 381574bdb7
2 changed files with 11 additions and 40 deletions

View File

@ -7,9 +7,7 @@ include_directories(
${OpenCV_INCLUDE_DIRS} ${OpenCV_INCLUDE_DIRS}
) )
add_executable( add_library(pnp_lib
pnp_registration
src/main_registration.cpp
src/CsvReader.cpp src/CsvReader.cpp
src/CsvWriter.cpp src/CsvWriter.cpp
src/ModelRegistration.cpp src/ModelRegistration.cpp
@ -17,41 +15,14 @@ pnp_registration
src/Model.cpp src/Model.cpp
src/PnPProblem.cpp src/PnPProblem.cpp
src/Utils.cpp src/Utils.cpp
src/RobustMatcher.cpp src/RobustMatcher.cpp)
)
add_executable( add_executable( pnp_registration src/main_registration.cpp )
pnp_verification add_executable( pnp_verification src/main_verification.cpp )
src/main_verification.cpp add_executable( pnp_detection src/main_detection.cpp )
src/CsvReader.cpp add_executable( pnp_test src/test_pnp.cpp )
src/CsvWriter.cpp
src/ModelRegistration.cpp
src/Mesh.cpp
src/Model.cpp
src/PnPProblem.cpp
src/Utils.cpp
src/RobustMatcher.cpp
)
add_executable( target_link_libraries( pnp_registration pnp_lib ${OpenCV_LIBS} )
pnp_detection target_link_libraries( pnp_verification pnp_lib ${OpenCV_LIBS} )
src/main_detection.cpp target_link_libraries( pnp_detection pnp_lib ${OpenCV_LIBS} )
src/CsvReader.cpp target_link_libraries( pnp_test pnp_lib ${OpenCV_LIBS} )
src/CsvWriter.cpp
src/ModelRegistration.cpp
src/Mesh.cpp
src/Model.cpp
src/PnPProblem.cpp
src/Utils.cpp
src/RobustMatcher.cpp
)
add_executable(
pnp_test
src/test_pnp.cpp
)
target_link_libraries( pnp_registration ${OpenCV_LIBS} )
target_link_libraries( pnp_verification ${OpenCV_LIBS} )
target_link_libraries( pnp_detection ${OpenCV_LIBS} )
target_link_libraries( pnp_test ${OpenCV_LIBS} )

View File

@ -256,7 +256,7 @@ int main(int, char**)
pnp_verification_epnp.estimatePose( list_points3d_model_match, list_points2d_scene_match, cv::EPNP); pnp_verification_epnp.estimatePose( list_points3d_model_match, list_points2d_scene_match, cv::EPNP);
pnp_verification_iter.estimatePose( list_points3d_model_match, list_points2d_scene_match, cv::ITERATIVE); pnp_verification_iter.estimatePose( list_points3d_model_match, list_points2d_scene_match, cv::ITERATIVE);
//pnp_verification_p3p.estimatePose( list_points3d_model_match, list_points2d_scene_match, cv::P3P); //pnp_verification_p3p.estimatePose( list_points3d_model_match, list_points2d_scene_match, cv::P3P);
pnp_verification_dls.estimatePose( list_points3d_model_match, list_points2d_scene_match, cv::DLS); //pnp_verification_dls.estimatePose( list_points3d_model_match, list_points2d_scene_match, cv::DLS);
// Draw mesh // Draw mesh
drawObjectMesh(img_vis, &mesh, &pnp_verification_dls, green); drawObjectMesh(img_vis, &mesh, &pnp_verification_dls, green);