Permalink
Browse files

ASPCore build fix

If VW_BUNDLEADJUSTMENT is unavailable don't build BundleAdjustUtils.

Not to self: who uses BundleAdjustUtils?
  • Loading branch information...
1 parent d76428c commit 35a56b10fc208982c80e6adfaaccf6bb52f28ea2 Zack Moratto committed Apr 1, 2010
Showing with 12 additions and 3 deletions.
  1. +2 −0 configure.ac
  2. +10 −3 src/asp/Core/Makefile.am
View
@@ -200,6 +200,8 @@ AX_PKG(VW_INTEREST_POINT, [VW], [-lvwInterestPoint],[vw/Interest
AX_PKG(VW_PHOTOMETRY, [VW], [-lvwPhotometry])
AX_PKG(VW_BUNDLEADJUSTMENT, [VW_INTEREST_POINT VW_CARTOGRAPHY VW_STEREO], [-lvwBundleAdjustment], [vw/BundleAdjustment/AdjustBase.h])
+AM_CONDITIONAL(HAVE_PKG_VW_BUNDLEADJUSTMENT, [test "$HAVE_PKG_VW_BUNDLEADJUSTMENT" = "yes"])
+
AX_PKG_ONE_OF(GL,
APPLE_GL,
[AX_PKG_APPLE([GL], [], [-framework OpenGL -framework GLUT -Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib])],
View
@@ -11,12 +11,19 @@
if MAKE_MODULE_CORE
+if HAVE_PKG_VW_BUNDLEADJUSTMENT
+
+ba_headers = BundleAdjustUtils.h
+ba_sources = BundleAdjustUtils.cc
+
+endif
+
include_HEADERS = BlobIndexThreaded.h StereoSettings.h SparseView.h \
InpaintView.h MedianFilter.h OrthoRasterizer.h \
- SoftwareRenderer.h BundleAdjustUtils.h
+ SoftwareRenderer.h $(ba_headers)
-libaspCore_la_SOURCES = BlobIndexThreaded.cc BundleAdjustUtils.cc \
- SoftwareRenderer.cc StereoSettings.cc
+libaspCore_la_SOURCES = BlobIndexThreaded.cc SoftwareRenderer.cc \
+ StereoSettings.cc $(ba_sources)
libaspCore_la_LIBADD = @MODULE_CORE_LIBS@

0 comments on commit 35a56b1

Please sign in to comment.