cmake/config.cmake: Look for postproc/postprocess.h or libpostproc/postprocess.h.

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

diff --git a/extras/buildsystem/cmake/include/config.cmake b/extras/buildsystem/cmake/include/config.cmake
index c9233634501f95735220f316cd7c43e8c2433de6..f79badbc545f8ea7d8b72fb27ea89750bb91edf3 100644 (file)
--- a/extras/buildsystem/cmake/include/config.cmake
+++ b/extras/buildsystem/cmake/include/config.cmake
@@ -14,6 +14,7 @@ include (CheckLibraryExists)
 # has been set.
 
 OPTION( ENABLE_HTTPD           "Enable httpd server" ON )
+OPTION( ENABLE_STREAM_OUT      "Enable stream output plugins" ON )
 OPTION( ENABLE_VLM             "Enable vlm" ON )
 OPTION( ENABLE_DYNAMIC_PLUGINS "Enable dynamic plugin" ON )
 OPTION( UPDATE_CHECK           "Enable automatic new version checking" OFF )
@@ -389,6 +390,18 @@ vlc_enable_modules(packetizer_vc1)
 vlc_enable_modules(spatializer)
 vlc_enable_modules(asf)
 
+set(enabled ${ENABLE_STREAM_OUT})
+vlc_register_modules(${enabled} access_output_dummy access_output_udp access_output_file access_output_http)
+vlc_register_modules(${enabled} mux_ps mux_avi mux_mp4 mux_asf mux_dummy mux_wav mux_mpjpeg)
+vlc_register_modules(${enabled} packetizer_copy)
+
+vlc_register_modules(${enabled} stream_out_dummy stream_out_standard stream_out_es stream_out_rtp stream_out_description vod_rtsp)
+vlc_register_modules(${enabled} stream_out_duplicate stream_out_display stream_out_transcode stream_out_bridge stream_out_mosaic_bridge stream_out_autodel)
+vlc_register_modules(${enabled} stream_out_gather)
+# vlc_register_modules(${enabled} stream_out_transrate)
+# vlc_register_modules(${enabled} rtcp)
+vlc_register_modules(${enabled} profile_parser)
+
 if(NOT mingwce)
    set(enabled ON)
 endif(NOT mingwce)
@@ -451,12 +464,11 @@ 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)
-  
-  check_include_files ("stdint.h;postproc/postprocess.h" HAVE_POSTPROC_POSTPROCESS_H)
+  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)
+  vlc_check_include_files (postproc/postprocess.h libpostproc/postprocess.h)
+
   vlc_enable_modules(ffmpeg)
   vlc_add_module_compile_flag(ffmpeg ${FFmpeg_CFLAGS})
   vlc_module_add_link_libraries(ffmpeg ${FFmpeg_LIBRARIES})
@@ -567,9 +579,12 @@ endif(Mpeg2_FOUND)
 
 find_package(Dvbpsi)
 if(Dvbpsi_FOUND)
+  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(ts      ${Dvbpsi_LIBRARIES})
+  vlc_module_add_link_libraries(mux_ts  ${Dvbpsi_LIBRARIES})
+  vlc_module_add_link_libraries(dvb     ${Dvbpsi_LIBRARIES})
 endif(Dvbpsi_FOUND)
 
 set(CMAKE_REQUIRED_INCLUDES)