Merge pull request #1018 from HazenBabcock/spinnakerc-linux

SpinnakerC: build on Linux.

Author: marktsuchida

DeviceAdapters/Makefile.am

@@ -65,6 +65,9 @@ endif
 if BUILD_SPINNAKER
    SPINNAKER = Spinnaker
 endif
+if BUILD_SPINNAKERC
+   SPINNAKERC = SpinnakerC
+endif
 if BUILD_SPOT
    SPOT = Spot
 endif
@@ -102,6 +105,7 @@ SUBDIRS = \
 	$(SEQUENCE_TESTER) \
 	$(SIMPLECAM) \
         $(SPINNAKER) \
+	$(SPINNAKERC) \
 	$(SPOT) \
 	$(USBMANAGER) \
 	$(V4L) \

DeviceAdapters/SpinnakerC/Makefile.am

@@ -0,0 +1,17 @@
+
+AM_CXXFLAGS=$(MMDEVAPI_CXXFLAGS)
+
+# Linux default install location
+SPINNAKER_ROOT=/opt/spinnaker
+
+SPINNAKERCPPFLAGS = -I$(SPINNAKER_ROOT)/include/spinc
+SPINNAKERLDFLAGS = -L$(SPINNAKER_ROOT)/lib -Wl,--enable-new-dtags -Wl,-rpath,$(SPINNAKER_ROOT)/lib
+SPINNAKERLDLIBS = -lSpinnaker_C
+
+deviceadapter_LTLIBRARIES=libmmgr_dal_SpinnakerC.la
+libmmgr_dal_SpinnakerC_la_SOURCES=SpinnakerCCamera.cpp SpinnakerCCamera.h
+libmmgr_dal_SpinnakerC_la_CPPFLAGS=$(SPINNAKERCPPFLAGS)
+libmmgr_dal_SpinnakerC_la_LIBADD=$(MMDEVAPI_LIBADD) $(SPINNAKERLDLIBS)
+libmmgr_dal_SpinnakerC_la_LDFLAGS=$(MMDEVAPI_LDFLAGS) $(SPINNAKERLDFLAGS)
+
+EXTRA_DIST = SpinnakerC.vcxproj SpinnakerC.vcxproj.filters LICENSE

DeviceAdapters/configure.ac

@@ -422,6 +422,15 @@ else
    AC_MSG_RESULT([not found])
 fi
 
+# Spinnaker C API (FLIR); installed with the Spinnaker SDK.
+AC_MSG_CHECKING(for Spinnaker C API)
+AM_CONDITIONAL([BUILD_SPINNAKERC],[test -f "/opt/spinnaker/include/spinc/SpinnakerC.h"])
+if test -f "/opt/spinnaker/include/spinc/SpinnakerC.h"; then
+   AC_MSG_RESULT([found])
+else
+   AC_MSG_RESULT([not found])
+fi
+
 
 # Vimba X (Allied Vision) SDK
 MM_ARG_WITH_OPTIONAL_LIB([Vimba X], [vimba-x], [VIMBA_X])
@@ -650,6 +659,7 @@ m4_define([device_adapter_dirs], [m4_strip([
    SouthPort
    SpectralLMM5
    Spinnaker
+   SpinnakerC
    Spot
    StarlightXpress
    SutterLambda