Move PinholeModelCalibrate to the graveyard.

oleg-alexandrov · Sep 24, 2018 · ce36c58 · ce36c58
1 parent f25cc2a
commit ce36c58
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 5 deletions.
diff --git a/src/vw/Camera/PinholeModelCalibrate.h → graveyard/PinholeModelCalibrate.h b/src/vw/Camera/PinholeModelCalibrate.h → graveyard/PinholeModelCalibrate.h
diff --git a/...amera/tests/TestPinholeModelCalibrate.cxx → graveyard/TestPinholeModelCalibrate.cxx b/...amera/tests/TestPinholeModelCalibrate.cxx → graveyard/TestPinholeModelCalibrate.cxx
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -64,7 +64,7 @@ execute_process(
 
 # Set the install path if not specified by the user.
 if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
-#BINARY BUILDER IGNORE 
+  set (CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/build/install" CACHE PATH "default install path" FORCE ) 
 endif()
 message("Cmake install directory set to: ${CMAKE_INSTALL_PREFIX}")
 

diff --git a/src/vw/Camera/Makefile.am b/src/vw/Camera/Makefile.am
@@ -28,8 +28,7 @@ lapack_headers = \
 	CameraSolve.h \
 	Extrinsics.h \
 	LensDistortion.h \
-	LinescanModel.h \
-	PinholeModelCalibrate.h
+	LinescanModel.h
 
 lapack_sources = \
 	CameraGeometry.cc \

diff --git a/src/vw/Camera/tests/Makefile.am b/src/vw/Camera/tests/Makefile.am
@@ -29,7 +29,6 @@ TestCameraGeometry_SOURCES        = TestCameraGeometry.cxx
 TestExifData_SOURCES              = TestExifData.cxx
 TestExtrinsics_SOURCES            = TestExtrinsics.cxx
 TestPinholeModel_SOURCES          = TestPinholeModel.cxx
-TestPinholeModelCalibrate_SOURCES = TestPinholeModelCalibrate.cxx
 TestAdjustedCamera_SOURCES        = TestAdjustedCamera.cxx
 TestLinescanModel_SOURCES         = TestLinescanModel.cxx
 
@@ -39,7 +38,7 @@ TestLinescanModel_SOURCES         = TestLinescanModel.cxx
 TESTS = TestCAHVModel TestCAHVORModel TestCAHVOREModel  \
         TestCameraGeometry TestExifData TestExtrinsics  \
         TestLinescanModel TestPinholeModel               \
-        TestPinholeModelCalibrate TestAdjustedCamera
+        TestAdjustedCamera
 
 #include $(top_srcdir)/config/instantiate.am