Permalink
Browse files

A few tweaks to the stereo build system to get it to work on os 10.5

  • Loading branch information...
1 parent cc473ca commit 200be143fa987bdeedf547135971d1af25e1ce85 @broxtronix broxtronix committed Feb 1, 2008
Showing with 14 additions and 24 deletions.
  1. +2 −1 configure.ac
  2. +12 −23 src/Makefile.am
View
@@ -251,12 +251,13 @@ AX_PKG(QT_GUI, [], [], [QLabel], [QtGui])
AX_PKG(ISIS3RDPARTY, [], [-lgeos -lxerces-c -lgsl -lgslcblas -liconv -lqwt])
AX_PKG(ISIS, [], [-lisis3])
+AM_CONDITIONAL(HAVE_PKG_ISIS, [test "$HAVE_PKG_ISIS" = "yes"])
+
##################################################
# module definitions
##################################################
AX_APP(STEREO, [src], yes, [BOOST BOOST_PROGRAM_OPTIONS BOOST_FILESYSTEM VW VW_CAMERA VW_CARTOGRAPHY VW_STEREO VW_INTEREST_POINT LAPACK MBA SPICE], [ISIS ISIS3RDPARTY QT_CORE QT_GUI])
-AX_APP(ISISSTEREO, [src], yes, [BOOST BOOST_PROGRAM_OPTIONS BOOST_FILESYSTEM VW VW_CAMERA VW_CARTOGRAPHY VW_STEREO VW_INTEREST_POINT LAPACK MBA SPICE ISIS ISIS3RDPARTY])
AX_APP(DISPARITYDEBUG, [src], yes, [BOOST BOOST_PROGRAM_OPTIONS VW VW_STEREO])
AX_APP(POINT2MESH, [src], yes, [BOOST BOOST_PROGRAM_OPTIONS VW OPENSCENEGRAPH])
AX_APP(POINT2DEM, [src], yes, [BOOST BOOST_PROGRAM_OPTIONS VW VW_CARTOGRAPHY])
View
@@ -24,8 +24,10 @@
########################################################################
#include $(top_srcdir)/config/autotroll.mak
+if HAVE_PKG_ISIS
isis_sources = Isis/DiskImageResourceIsis.cc Isis/IsisCameraModel.cc \
- Isis/StereoSessionIsis.cc
+ Isis/StereoSessionIsis.cc
+endif
ctx_sources = MRO/StereoSessionCTX.cc MRO/DiskImageResourceDDD.cc \
MRO/CTXEphemeris.cc MRO/CTXMetadata.cc
@@ -49,19 +51,12 @@ if MAKE_APP_STEREO
bin_PROGRAMS += stereo
stereo_SOURCES = $(moc_sources) $(ctx_sources) $(hrsc_sources) \
$(apollo_sources) $(clementine_sources) \
- $(generic_stereo_sources) \
+ $(generic_stereo_sources) $(isis_sources) \
SpiceUtilities.cc stereo.cc
- stereo_LDFLAGS = $(APP_STEREO_LIBS)
+ stereo_LDFLAGS = $(APP_STEREO_LIBS) $(ASP_LDFLAGS)
endif
-# if MAKE_APP_ISISSTEREO
-# bin_PROGRAMS += isis_stereo
-# isis_stereo_SOURCES = $(generic_stereo_sources) $(isis_sources) \
-# isis_stereo.cc
-# isis_stereo_LDFLAGS = $(APP_ISISSTEREO_LIBS)
-# endif
-#if MAKE_APP_ASPGUI
# bin_PROGRAMS += aspgui
# aspgui_SOURCES = aspgui.cc gui/GlWidget.cc
# aspgui_CXXFLAGS = $(QT_CXXFLAGS) $(QT_INCPATH)
@@ -71,52 +66,46 @@ endif
if MAKE_APP_DISPARITYDEBUG
bin_PROGRAMS += disparitydebug
disparitydebug_SOURCES = disparitydebug.cc
- disparitydebug_LDFLAGS = $(APP_DISPARITYDEBUG_LIBS)
+ disparitydebug_LDFLAGS = $(APP_DISPARITYDEBUG_LIBS) $(ASP_LDFLAGS)
endif
if MAKE_APP_POINT2MESH
bin_PROGRAMS += point2mesh
point2mesh_SOURCES = point2mesh.cc nff_terrain.cc
- point2mesh_LDFLAGS = $(APP_POINT2MESH_LIBS)
+ point2mesh_LDFLAGS = $(APP_POINT2MESH_LIBS) $(ASP_LDFLAGS)
endif
if MAKE_APP_POINT2DEM
bin_PROGRAMS += point2dem
point2dem_SOURCES = point2dem.cc DEM.cc SoftwareRenderer.cc
- point2dem_LDFLAGS = $(APP_POINT2DEM_LIBS)
+ point2dem_LDFLAGS = $(APP_POINT2DEM_LIBS) $(ASP_LDFLAGS)
endif
if MAKE_APP_NURBS
bin_PROGRAMS += nurbs
nurbs_SOURCES = nurbs.cc
- nurbs_LDFLAGS = $(APP_NURBS_LIBS)
+ nurbs_LDFLAGS = $(APP_NURBS_LIBS) $(ASP_LDFLAGS)
endif
if MAKE_APP_CTXIMAGE
bin_PROGRAMS += ctximage
ctximage_SOURCES = ctximage.cc MRO/DiskImageResourceDDD.cc
- ctximage_LDFLAGS = $(APP_CTXIMAGE_LIBS)
+ ctximage_LDFLAGS = $(APP_CTXIMAGE_LIBS) $(ASP_LDFLAGS)
endif
if MAKE_APP_RMAX2CAHVOR
bin_PROGRAMS += rmax2cahvor
rmax2cahvor_SOURCES = rmax2cahvor.cc
- rmax2cahvor_LDFLAGS = $(APP_RMAX2CAHVOR_LIBS)
+ rmax2cahvor_LDFLAGS = $(APP_RMAX2CAHVOR_LIBS) $(ASP_LDFLAGS)
endif
if MAKE_APP_RMAXADJUST
bin_PROGRAMS += rmax_adjust
rmax_adjust_SOURCES = rmax_adjust.cc
- rmax_adjust_LDFLAGS = $(APP_RMAXADJUST_LIBS)
+ rmax_adjust_LDFLAGS = $(APP_RMAXADJUST_LIBS) $(ASP_LDFLAGS)
endif
-# ctx2kml_SOURCES = ctx2kml.cc MRO/DiskImageResourceDDD.cc
-# orbitviz_SOURCES = orbitviz.cc Spice.cc
-# orthoproject_SOURCES = orthoproject.cc $(generic_stereo_sources)
-# # ctximage_SOURCES = ctximage.cc MRO/DiskImageResourceDDD.cc
-# stereodefault_SOURCES = stereodefault.cc file_lib.cc
-
AM_CPPFLAGS = @ASP_CPPFLAGS@
AM_LDFLAGS = @ASP_LDFLAGS@

0 comments on commit 200be14

Please sign in to comment.