Merge pull request #58 from fjonath1/master

Fixed cmake script for camodocal_test and using internal ceres
hengli · Nov 24, 2016 · 511c578 · 511c578
2 parents 9b135dd + bc5f818
commit 511c578
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/src/calib/CMakeLists.txt b/src/calib/CMakeLists.txt
@@ -84,23 +84,30 @@ endif(VCHARGE_VIZ)
 
 camodocal_install(camodocal_calib)
 
-if(OpenCV_FOUND)
+if(OpenCV_FOUND AND HAVE_OPENCV_XFEATURES2D_NONFREE)
 camodocal_test(CamOdoCalibration)
 camodocal_link_libraries(CamOdoCalibration_test 
   ${CAMODOCAL_PLATFORM_UNIX_LIBRARIES}
   camodocal_calib
+  ${OPENCV_LIBS}
+  camodocal_gpl
 )
-endif(OpenCV_FOUND)
-
 
 camodocal_test(HandEyeCalibration)
 camodocal_link_libraries(HandEyeCalibration_test 
   ${CAMODOCAL_PLATFORM_UNIX_LIBRARIES}
   camodocal_calib
+  ${OPENCV_LIBS}
+  camodocal_gpl
 )
 
 camodocal_test(PlanarHandEyeCalibration)
 camodocal_link_libraries(PlanarHandEyeCalibration_test
   ${CAMODOCAL_PLATFORM_UNIX_LIBRARIES}
   camodocal_calib
+  ${OPENCV_LIBS}
+  camodocal_gpl
 )
+else(OpenCV_FOUND AND HAVE_OPENCV_XFEATURES2D_NONFREE)
+  message(STATUS "CANNOT BUILD CamOdoCalibration_test, HandEyeCalibration_test, and PlanarHandEyeCalibration_test because it depends on OPENCV and HAVE_OPENCV_XFEATURES2D_NONFREE.")
+endif(OpenCV_FOUND AND HAVE_OPENCV_XFEATURES2D_NONFREE)
diff --git a/src/ceres-solver/CMakeLists.txt b/src/ceres-solver/CMakeLists.txt
@@ -1,4 +1,4 @@
-#if(NOT CERES_FOUND)
+if(NOT CERES_FOUND)
 if(GLOG_FOUND)
     # Google Logging
     set(GLOG_LIB ${GLOG_LIBRARIES})
@@ -108,4 +108,4 @@ include_directories(
 add_subdirectory(internal/ceres)
 
 endif(GLOG_FOUND)
-#endif(NOT CERES_FOUND)
+endif(NOT CERES_FOUND)