Merge pull request #132 from cchampet/build_fixFindFFmpegOnWindows

valnoel · valnoel · commit 6408eabc4290 · 2015-03-17T16:33:35.000+01:00
Fix build on windows (find ffmpeg)
diff --git a/cmake/FindFFmpeg.cmake b/cmake/FindFFmpeg.cmake
@@ -32,35 +32,39 @@ endmacro()
 
 
 ### Macro: find_component
-#	
-# Check the given component by invoking pkgconfig and 
+#
+# Check the given component by invoking pkgconfig and
 # then looking up the libraries and include directories.
-# @todo: WIN and MAC OSX.
 #
 macro(find_component COMPONENT PKGCONFIG LIBRARY HEADER)
 	if(NOT WIN32)
-		# use pkg-config to get the directories and then use these values
-		# in the FIND_PATH() and FIND_LIBRARY() calls
+		# use pkg-config to get the directories
 		find_package(PkgConfig)
 		if(PKG_CONFIG_FOUND)
 			pkg_check_modules(PC_${COMPONENT} ${PKGCONFIG})
 		endif()
+		# find include
+		find_path(${COMPONENT}_INCLUDE_DIR
+			${HEADER}
+			HINTS ${PC_${COMPONENT}_INCLUDEDIR} ${PC_${COMPONENT}_INCLUDE_DIR}
+		)
+		# find lib
+		find_library(${COMPONENT}_LIBRARIES
+			NAMES ${LIBRARY}
+			HINTS ${PC_${COMPONENT}_LIBDIR} ${PC_${COMPONENT}_LIBRARY_DIRS}
+		)
+		# set definition and version
+		set(${COMPONENT}_DEFINITIONS ${PC_${COMPONENT}_CFLAGS_OTHER} CACHE STRING "The ${COMPONENT} CFLAGS.")
+		set(${COMPONENT}_VERSION ${PC_${COMPONENT}_VERSION} CACHE STRING "The ${COMPONENT} version number.")
+	else()
+		# find include
+		find_path(${COMPONENT}_INCLUDE_DIR ${HEADER})
+		# find lib
+		file(GLOB_RECURSE ${COMPONENT}_LIBRARIES "${CMAKE_PREFIX_PATH}/*${COMPONENT}.lib") 
+		# @todo: define definition and version
 	endif()
 
-	find_path(${COMPONENT}_INCLUDE_DIR
-		${HEADER}
-		HINTS ${PC_${COMPONENT}_INCLUDEDIR} ${PC_${COMPONENT}_INCLUDE_DIR}
-	)
-
-	find_library(${COMPONENT}_LIBRARIES 
-		NAMES ${LIBRARY}
-		HINTS ${PC_${COMPONENT}_LIBDIR} ${PC_${COMPONENT}_LIBRARY_DIRS}
-	)
-
-	set(${COMPONENT}_DEFINITIONS ${PC_${COMPONENT}_CFLAGS_OTHER} CACHE STRING "The ${COMPONENT} CFLAGS.")	
-	set(${COMPONENT}_VERSION ${PC_${COMPONENT}_VERSION} CACHE STRING "The ${COMPONENT} version number.")
-
-	# Marks the given component as found if both *_LIBRARIES AND *_INCLUDE_DIR is present.	
+	# Marks the given component as found if both *_LIBRARIES AND *_INCLUDE_DIR is present.
 	if(${COMPONENT}_LIBRARIES AND ${COMPONENT}_INCLUDE_DIR)
 		set(${COMPONENT}_FOUND TRUE)
 	else()
diff --git a/src/AvTranscoder/decoder/AudioGenerator.cpp b/src/AvTranscoder/decoder/AudioGenerator.cpp
@@ -22,6 +22,7 @@ AudioGenerator& AudioGenerator::operator=( const AudioGenerator& audioGenerator
 	_inputFrame = NULL;
 	_silent = NULL;
 	_frameDesc = audioGenerator.getAudioFrameDesc();
+	return *this;
 }
 
 AudioGenerator::~AudioGenerator()
diff --git a/src/AvTranscoder/decoder/VideoGenerator.cpp b/src/AvTranscoder/decoder/VideoGenerator.cpp
@@ -24,6 +24,7 @@ VideoGenerator& VideoGenerator::operator=( const VideoGenerator& videoGenerator
 	_inputFrame = NULL;
 	_blackImage = NULL;
 	_frameDesc = videoGenerator.getVideoFrameDesc();
+	return *this;
 }
 
 VideoGenerator::~VideoGenerator()
diff --git a/src/AvTranscoder/frame/Frame.cpp b/src/AvTranscoder/frame/Frame.cpp
@@ -28,6 +28,7 @@ Frame::Frame( const Frame& other )
 Frame& Frame::operator=( const Frame& other )
 {
 	copyAVPacket( other.getAVPacket() );
+	return *this;
 }
 
 Frame::~Frame()

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ AudioGenerator& AudioGenerator::operator=( const AudioGenerator& audioGenerator`
`22`	`22`	`_inputFrame = NULL;`
`23`	`23`	`_silent = NULL;`
`24`	`24`	`_frameDesc = audioGenerator.getAudioFrameDesc();`
	`25`	`+ return *this;`
`25`	`26`	`}`
`26`	`27`
`27`	`28`	`AudioGenerator::~AudioGenerator()`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@ VideoGenerator& VideoGenerator::operator=( const VideoGenerator& videoGenerator`
`24`	`24`	`_inputFrame = NULL;`
`25`	`25`	`_blackImage = NULL;`
`26`	`26`	`_frameDesc = videoGenerator.getVideoFrameDesc();`
	`27`	`+ return *this;`
`27`	`28`	`}`
`28`	`29`
`29`	`30`	`VideoGenerator::~VideoGenerator()`
Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@ Frame::Frame( const Frame& other )`
`28`	`28`	`Frame& Frame::operator=( const Frame& other )`
`29`	`29`	`{`
`30`	`30`	`copyAVPacket( other.getAVPacket() );`
	`31`	`+ return *this;`
`31`	`32`	`}`
`32`	`33`
`33`	`34`	`Frame::~Frame()`