Fixed optional dependancy on aravis (only needed for GigEVision camer…

…a support)
Abaco-Systems · Mar 15, 2017 · e0a27bd · e0a27bd
1 parent f9d6b86
commit e0a27bd
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -45,8 +45,11 @@ set(
 )
 endif()
 
-# Aravis setup
-include_directories(/usr/local/include/aravis-0.6)
+# Aravis setup if installed
+if(EXISTS "/usr/local/lib/libaravis-0.6.so")
+  include_directories(/usr/local/include/aravis-0.6)
+  set(ARAVIS_LIB aravis-0.6)
+endif()
 
 # setup project output paths
 set(PROJECT_OUTPUT_DIR  ${PROJECT_BINARY_DIR}/${CMAKE_SYSTEM_PROCESSOR})
@@ -71,7 +74,7 @@ file(GLOB inferenceSources *.cpp *.cu camera/*.cpp cuda/*.cu display/*.cpp)
 file(GLOB inferenceIncludes *.h camera/*.h cuda/*.h display/*.h)
 
 cuda_add_library(jetson-inference SHARED ${inferenceSources})
-target_link_libraries(jetson-inference nvcaffe_parser nvinfer Qt4::QtGui GL GLEW gstreamer-1.0 gstapp-1.0 aravis-0.6)		# gstreamer-0.10 gstbase-0.10 gstapp-0.10 
+target_link_libraries(jetson-inference nvcaffe_parser nvinfer Qt4::QtGui GL GLEW gstreamer-1.0 gstapp-1.0 ${ARAVIS_LIB})		# gstreamer-0.10 gstbase-0.10 gstapp-0.10 
 
 
 # transfer all headers to the include directory

diff --git a/camera/camera.cpp b/camera/camera.cpp
@@ -109,15 +109,15 @@ bool camera::ConvertRGBtoRGBA( void* input, void** output )
 	{
 		if( CUDA_FAILED(cudaMalloc(&mRGBA, mWidth * mHeight * sizeof(float4))) )
 		{
-			printf(LOG_CUDA "gvCamera -- failed to allocate memory for %ux%u RGBA texture\n", mWidth, mHeight);
+			printf(LOG_CUDA "camera -- failed to allocate memory for %ux%u RGBA texture\n", mWidth, mHeight);
 			return false;
 		}
 	}
 
 	// USB webcam is RGB
 	if( CUDA_FAILED(cudaRGBToRGBAf((uint8_t*)input, (float4*)mRGBA, mWidth, mHeight)) )
 	{
-		printf(LOG_CUDA "gvCamera -- conversion cudaRGBToRGBAf failed\n");
+		printf(LOG_CUDA "camera -- conversion cudaRGBToRGBAf failed (%dx%d)\n", mWidth, mHeight);
 		return false;
 	}
 

diff --git a/imagenet-camera/imagenet-camera.cpp b/imagenet-camera/imagenet-camera.cpp
@@ -188,7 +188,7 @@ int main( int argc, char** argv )
 		return 0;
 	}
 
-	printf("\nimagenet-camera:  successfully initialized video device (%s%s)\n", VIDEO_SRC_NAME, VIDEO_GV_PIXEL_FORMAT_NAME);
+	printf("\nimagenet-camera:  successfully initialized video device (%s)\n", VIDEO_SRC_NAME);
 
 	/*
 	 * create imageNet