libpostproc/postprocess.h always includes needed headers

[vlc] / extras / buildsystem / cmake / include / config.cmake

diff --git a/extras/buildsystem/cmake/include/config.cmake b/extras/buildsystem/cmake/include/config.cmake
index f2421d12d8045dd880c4ca3c6360d8d41048c171..35cc80383713641f58308afb1090b204a9a4784a 100644 (file)
--- a/extras/buildsystem/cmake/include/config.cmake
+++ b/extras/buildsystem/cmake/include/config.cmake
@@ -63,9 +63,9 @@ include( ${CMAKE_SOURCE_DIR}/cmake/pkg_check_modules.cmake )
 # Versioning
 ###########################################################
 
-set(VLC_VERSION_MAJOR 0)
-set(VLC_VERSION_MINOR 9)
-set(VLC_VERSION_PATCH 0)
+set(VLC_VERSION_MAJOR "0")
+set(VLC_VERSION_MINOR "9")
+set(VLC_VERSION_PATCH "0")
 set(VLC_VERSION_EXTRA "-svn")
 set(VLC_VERSION ${VLC_VERSION_MAJOR}.${VLC_VERSION_MINOR}.${VLC_VERSION_PATCH}${VLC_VERSION_EXTRA})
 
@@ -464,12 +464,17 @@ if(FFmpeg_FOUND)
   set( CMAKE_REQUIRED_FLAGS_saved ${CMAKE_REQUIRED_FLAGS} )
   set( CMAKE_REQUIRED_FLAGS ${FFmpeg_CFLAGS} )
 
-  vlc_check_include_files (ffmpeg/avcodec.h)
-  vlc_check_include_files (ffmpeg/avutil.h)
-  vlc_check_include_files (ffmpeg/swscale.h)
-  check_include_files (swscale.h HAVE_LIBSWSCALE_TREE)
+  vlc_check_include_files (ffmpeg/avcodec.h libavcodec/avcodec.h)
+  vlc_check_include_files (ffmpeg/avutil.h libavutil/avutil.h)
+  vlc_check_include_files (ffmpeg/swscale.h libswscale/swscale.h)
+  check_c_source_compiles( "#include <stdint.h>\n#include <postproc/postprocess.h>\nint main(){return 0;}" HAVE_POSTPROC_POSTPROCESS_H )
+  vlc_check_include_files (libpostproc/postprocess.h)
   
-  check_include_files ("stdint.h;postproc/postprocess.h" HAVE_POSTPROC_POSTPROCESS_H)
+  message( STATUS "avcodec found ${HAVE_FFMPEG_AVCODEC_H} || ${HAVE_LIBAVCODEC_AVCODEC_H}")
+  message( STATUS "avutil found ${HAVE_FFMPEG_AVUTIL_H} || ${HAVE_LIBAVUTIL_AVUTIL_H}")
+  message( STATUS "swscale found ${HAVE_FFMPEG_SWSCALE_H} || ${HAVE_LIBSWSCALE_SWSCALE_H}")
+  message( STATUS "postprocess found ${HAVE_POSTPROC_POSTPROCESS_H} || ${HAVE_LIBPOSTPROC_POSTPROCESS_H}")
+
   vlc_enable_modules(ffmpeg)
   vlc_add_module_compile_flag(ffmpeg ${FFmpeg_CFLAGS})
   vlc_module_add_link_libraries(ffmpeg ${FFmpeg_LIBRARIES})
@@ -580,11 +585,11 @@ endif(Mpeg2_FOUND)
 
 find_package(Dvbpsi)
 if(Dvbpsi_FOUND)
-  vlc_register_modules(${ENABLE_STREAM_OUT} sout_ts)
+  vlc_register_modules(${ENABLE_STREAM_OUT} mux_ts)
   vlc_enable_modules(ts)
   check_include_files ("stdint.h;dvbpsi/dvbpsi.h;dvbpsi/demux.h;dvbpsi/descriptor.h;dvbpsi/pat.h;dvbpsi/pmt.h;dvbpsi/sdt.h;dvbpsi/dr.h" HAVE_DVBPSI_DR_H)
   vlc_module_add_link_libraries(ts      ${Dvbpsi_LIBRARIES})
-  vlc_module_add_link_libraries(sout_ts ${Dvbpsi_LIBRARIES})
+  vlc_module_add_link_libraries(mux_ts  ${Dvbpsi_LIBRARIES})
   vlc_module_add_link_libraries(dvb     ${Dvbpsi_LIBRARIES})
 endif(Dvbpsi_FOUND)