Merge pull request #266 from cchampet/cmake_checkFFmbc

valnoel · valnoel · commit 7a4bf347bfbc · 2015-11-06T11:37:43.000+01:00
CMake: clean after checked integration with ffmbc
diff --git a/cmake/AvTranscoderMacros.cmake b/cmake/AvTranscoderMacros.cmake
@@ -10,16 +10,16 @@ file(GLOB_RECURSE AVTRANSCODER_SRC_FILES "AvTranscoder/*.cpp" "AvTranscoder/*.hp
 # AVTRANSCODER_VERSION
 file(STRINGS "${AVTRANSCODER_SRC_PATH}/AvTranscoder/common.hpp" _avtranscoder_VERSION_HPP_CONTENTS REGEX "#define AVTRANSCODER_VERSION_")
 foreach(v MAJOR MINOR MICRO)
-  if("${_avtranscoder_VERSION_HPP_CONTENTS}" MATCHES "#define AVTRANSCODER_VERSION_${v} ([0-9]+)")
-    set(AVTRANSCODER_VERSION_${v} "${CMAKE_MATCH_1}")
-  else()
-    set(AVTRANSCODER_RETRIEVE_VERSION_FAILED 1)
-  endif()
+	if("${_avtranscoder_VERSION_HPP_CONTENTS}" MATCHES "#define AVTRANSCODER_VERSION_${v} ([0-9]+)")
+		set(AVTRANSCODER_VERSION_${v} "${CMAKE_MATCH_1}")
+	else()
+		set(AVTRANSCODER_RETRIEVE_VERSION_FAILED 1)
+	endif()
 endforeach()
 unset(_avtranscoder_VERSION_HPP_CONTENTS)
 
 set(AVTRANSCODER_VERSION "${AVTRANSCODER_VERSION_MAJOR}.${AVTRANSCODER_VERSION_MINOR}.${AVTRANSCODER_VERSION_MICRO}")
 
 if(AVTRANSCODER_RETRIEVE_VERSION_FAILED)
-  message(SEND_ERROR "Failed to retrieve AvTranscoder version: ${AVTRANSCODER_VERSION}")
+	message(SEND_ERROR "Failed to retrieve AvTranscoder version: ${AVTRANSCODER_VERSION}")
 endif()
diff --git a/cmake/FindFFmpeg.cmake b/cmake/FindFFmpeg.cmake
@@ -100,8 +100,9 @@ macro(manage_components)
 				set(FFMPEG_INCLUDE_DIR ${${COMPONENT}_INCLUDE_DIR})
 				set(FFMPEG_LIBRARIES ${FFMPEG_LIBRARIES} ${${COMPONENT}_LIBRARIES})
 				set(FFMPEG_DEFINITIONS ${FFMPEG_DEFINITIONS} ${${COMPONENT}_DEFINITIONS})
-                        else()
-                                set(${COMPONENT}_FOUND FALSE)
+			else()
+				message(STATUS "Skip ${COMPONENT} component because it was found elsewhere ('${${COMPONENT}_INCLUDE_DIR}' instead of '${FFMPEG_INCLUDE_DIR}').")
+				set(${COMPONENT}_FOUND FALSE)
 			endif()
 		else()
 			if(FFmpeg_FIND_REQUIRED)
@@ -121,12 +122,12 @@ endmacro()
 
 # Check FFmpeg version
 if(DEFINED FFmpeg_FIND_VERSION)
-        check_ffmpeg_version()
+	check_ffmpeg_version()
 endif()
 
 # Get basic components if no one is indicated
 if(NOT FFmpeg_FIND_COMPONENTS)
-        set(FFmpeg_FIND_COMPONENTS avcodec avformat avutil)
+	set(FFmpeg_FIND_COMPONENTS avcodec avformat avutil)
 endif()
 
 # Check each component
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -9,12 +9,12 @@ message(STATUS "AvTranscoder version is ${AVTRANSCODER_VERSION}")
 find_package(FFmpeg COMPONENTS avcodec avformat avutil swscale swresample avresample)
 if(swresample_FOUND)
 	add_definitions(-DAVTRANSCODER_FFMPEG_DEPENDENCY)
-        message(STATUS "Build avTranscoder with dependency to ffmpeg.")
+	message(STATUS "Build avTranscoder with dependency to ffmpeg.")
 elseif(avresample_FOUND)
 	add_definitions(-DAVTRANSCODER_LIBAV_DEPENDENCY)
 	message(STATUS "Build avTranscoder with dependency to libav.")
 else()
-        message(SEND_ERROR "Can't define if you depend on ffmpeg or libav.")
+	message(SEND_ERROR "Can't define if you depend on ffmpeg or libav.")
 endif()
 
 # Include AvTranscoder and FFmpeg
@@ -38,8 +38,7 @@ set_target_properties(avtranscoder-shared PROPERTIES SOVERSION ${AVTRANSCODER_VE
 set_target_properties(avtranscoder-shared PROPERTIES VERSION ${AVTRANSCODER_VERSION})
 set_target_properties(avtranscoder-shared PROPERTIES INSTALL_RPATH_USE_LINK_PATH 1)
 target_link_libraries(avtranscoder-shared ${FFMPEG_LIBRARIES})
-target_include_directories(avtranscoder-shared PUBLIC
-    ${AVTRANSCODER_SRC_PATH} ${FFMPEG_INCLUDE_DIR})
+target_include_directories(avtranscoder-shared PUBLIC ${AVTRANSCODER_SRC_PATH} ${FFMPEG_INCLUDE_DIR})
 
 
 ### Install AvTranscoder libs and include
@@ -120,12 +119,12 @@ if(SWIG_FOUND)
 		else()
 			message("PYTHON not found, will not build python binding.")
 		endif()
-        endif()
+	endif()
 
 	### JAVA BINDING
-        if(AVTRANSCODER_DISABLE_JAVA_BINDING)
+	if(AVTRANSCODER_DISABLE_JAVA_BINDING)
 		message("JAVA binding disabled, will not build java binding.")
-        else()
+	else()
 		find_package(Java)
 		find_package(JNI)
 		if(JAVA_FOUND AND JNI_FOUND)
