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})
set(PACKAGE "vlc")
+set(PACKAGE_VERSION "${VLC_VERSION}")
set(PACKAGE_STRING "vlc")
-set(VERSION_MESSAGE "vlc-${VLC_VERSION_MAJOR}.${VLC_VERSION_MINOR}.${VLC_VERSION_PATCH}${VLC_VERSION_EXTRA}")
+set(VERSION_MESSAGE "vlc-${VLC_VERSION}")
set(COPYRIGHT_MESSAGE "Copyright © the VideoLAN team")
set(COPYRIGHT_YEARS "2001-2008")
+set(PACKAGE_VERSION_EXTRA "${VLC_VERSION_EXTRA}")
+set(PACKAGE_VERSION_MAJOR "${VLC_VERSION_MAJOR}")
+set(PACKAGE_VERSION_MINOR "${VLC_VERSION_MINOR}")
+set(PACKAGE_VERSION_REVISION "${VLC_VERSION_PATCH}")
###########################################################
# Options
OPTION( ENABLE_VLM "Enable vlm" ON )
OPTION( ENABLE_DYNAMIC_PLUGINS "Enable dynamic plugin" ON )
OPTION( UPDATE_CHECK "Enable automatic new version checking" OFF )
-OPTION( ENABLE_NO_SYMBOL_CHECK "Don't check symbols of modules against libvlc. (Enabling this option speeds up compilation)" ON )
+OPTION( ENABLE_NO_SYMBOL_CHECK "Don't check symbols of modules against libvlc. (Enabling this option speeds up compilation)" OFF )
IF (NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE "Debug" CACHE STRING "build type determining compiler flags" FORCE )
if(CMAKE_BUILD_TYPE STREQUAL "Debug")
set(DEBUG ON)
- set(NDEBUG ON)
+ add_definitions(-DDEBUG=1)
+ set(NDEBUG OFF)
endif(CMAKE_BUILD_TYPE STREQUAL "Debug")
set( HAVE_DYNAMIC_PLUGINS ${ENABLE_DYNAMIC_PLUGINS})
set(CMAKE_EXTRA_INCLUDE_FILES)
set(CMAKE_EXTRA_INCLUDE_FILES unistd.h)
-vlc_check_functions_exist(isatty getcwd getuid)
+vlc_check_functions_exist(isatty getcwd getuid swab)
set(CMAKE_EXTRA_INCLUDE_FILES)
set(CMAKE_EXTRA_INCLUDE_FILES sys/stat.h)
vlc_check_functions_exist(lstat fstat stat)
set(CMAKE_EXTRA_INCLUDE_FILES)
+set(CMAKE_EXTRA_INCLUDE_FILES arpa/inet.h)
+vlc_check_functions_exist(inet_aton inet_ntop inet_pton)
+set(CMAKE_EXTRA_INCLUDE_FILES)
+
+set(CMAKE_EXTRA_INCLUDE_FILES sys/mman.h)
+vlc_check_functions_exist(mmap)
+set(CMAKE_EXTRA_INCLUDE_FILES)
+
set(CMAKE_REQUIRED_LIBRARIES)
check_library_exists(poll poll "" HAVE_POLL)
check_symbol_exists(ntohl "sys/param.h" NTOHL_IN_SYS_PARAM_H)
check_symbol_exists(scandir "dirent.h" HAVE_SCANDIR)
-check_symbol_exists(scandir "dirent.h" HAVE_SCANDIR)
check_symbol_exists(localtime_r "time.h" HAVE_LOCALTIME_R)
check_symbol_exists(alloca "alloca.h" HAVE_ALLOCA)
check_symbol_exists(connect "sys/types.h;sys/socket.h" HAVE_CONNECT)
if(NOT HAVE_CONNECT)
- check_library_exists(connect socket HAVE_CONNECT)
+ check_library_exists(connect socket "" HAVE_CONNECT)
if(NOT HAVE_CONNECT)
vlc_module_add_link_libraries(libvlc connect)
vlc_module_add_link_libraries(cdda connect)
set(CMAKE_SHARED_MODULE_CREATE_C_FLAGS
"${CMAKE_SHARED_MODULE_CREATE_C_FLAGS} ${DYNAMIC_LOOKUP}")
+ # For pre-10.5
+ set( CMAKE_SHARED_LIBRARY_C_FLAGS "${CMAKE_C_FLAGS} -fno-common")
+
set(SYS_DARWIN 1)
add_definitions(-std=gnu99) # Hack for obj-c files to be compiled with gnu99
- vlc_enable_modules(macosx minimal_macosx access_eyetv quartztext)
+ vlc_enable_modules(macosx minimal_macosx opengllayer
+ access_eyetv quartztext auhal)
+
+ # On Pre-10.5
+ vlc_module_add_link_flags (ffmpeg "-read_only_relocs warning")
- vlc_check_include_files (ApplicationServices/ApplicationServices.h)
- vlc_check_include_files (Carbon/Carbon.h)
- vlc_check_include_files (CoreAudio/CoreAudio.h)
+ # vlc_check_include_files (ApplicationServices/ApplicationServices.h)
+ # vlc_check_include_files (Carbon/Carbon.h)
+ # vlc_check_include_files (CoreAudio/CoreAudio.h)
# check_symbol_exists (CFLocaleCopyCurrent "CoreFoundation/CoreFoundation.h" "" HAVE_CFLOCALECOPYCURRENT)
# check_symbol_exists (CFPreferencesCopyAppValue "CoreFoundation/CoreFoundation.h" "" HAVE_CFPREFERENCESCOPYAPPVALUE)
vlc_find_frameworks(Cocoa Carbon OpenGL AGL IOKit Quicktime
- WebKit QuartzCore Foundation ApplicationServices)
+ WebKit QuartzCore Foundation ApplicationServices
+ CoreAudio AudioUnit AudioToolbox)
vlc_module_add_link_libraries(macosx
${Cocoa_FRAMEWORKS}
${IOKit_FRAMEWORKS}
vlc_module_add_link_libraries(quartztext
${Carbon_FRAMEWORKS}
${ApplicationServices_FRAMEWORKS} )
- vlc_module_add_link_libraries(mp4
- ${IOKit_FRAMEWORKS} )
+ vlc_module_add_link_libraries(auhal
+ ${Carbon_FRAMEWORKS}
+ ${CoreAudio_FRAMEWORKS}
+ ${AudioUnit_FRAMEWORKS}
+ ${AudioToolbox_FRAMEWORKS} )
+ vlc_module_add_link_libraries(mp4 ${IOKit_FRAMEWORKS} )
+ vlc_module_add_link_libraries(mkv ${IOKit_FRAMEWORKS} )
add_executable(VLC MACOSX_BUNDLE src/vlc.c)
target_link_libraries(VLC libvlc)
COMMAND sh -c "${command}"
OUTPUT_VARIABLE ${var}
OUTPUT_STRIP_TRAILING_WHITESPACE)
- string( REPLACE "\n" "\\n" ${var} ${${var}})
+ string( REPLACE "\n" "\\n" ${var} "${${var}}")
endmacro(command_to_configvar)
command_to_configvar( "whoami" VLC_COMPILE_BY )
vlc_enable_modules(packetizer_mpeg4video packetizer_mpeg4audio)
vlc_enable_modules(packetizer_vc1)
vlc_enable_modules(spatializer)
+vlc_enable_modules(asf)
if(NOT mingwce)
set(enabled ON)
vlc_enable_modules(screensaver)
endif(NOT WIN32)
-# Following modules will be disabled but listed in options
-
-vlc_disable_modules(asf)
-
# This module is disabled because the CMakeList.txt which
# is generated isn't correct. We'll put that back
# when cmake will be accepted as default build system
find_package(Dlopen)
set(HAVE_DL_DLOPEN ${Dlopen_FOUND})
+# Advanced Linux Sound Architecture (ALSA)
+pkg_check_modules(ALSA alsa>=1.0.0-rc4)
+if (${ALSA_FOUND})
+ set (HAVE_ALSA_NEW_API "1")
+else (${ALSA_FOUND})
+ pkg_check_modules(ALSA alsa)
+endif (${ALSA_FOUND})
+
+if (${ALSA_FOUND})
+ set (HAVE_ALSA "1")
+ vlc_enable_modules(alsa)
+ vlc_add_module_compile_flag(alsa ${ALSA_CFLAGS})
+ vlc_module_add_link_libraries(alsa ${ALSA_LIBRARIES})
+endif (${ALSA_FOUND})
+
+# Open Sound System (OSS)
+# TODO
+
find_package(FFmpeg)
if(FFmpeg_FOUND)
- set(CMAKE_EXTRA_INCLUDE_FILES stdint.h)
vlc_check_include_files (ffmpeg/avcodec.h)
vlc_check_include_files (ffmpeg/avutil.h)
vlc_check_include_files (ffmpeg/swscale.h)
- vlc_check_include_files (postproc/postprocess.h)
- set(CMAKE_EXTRA_INCLUDE_FILES)
+ check_include_files ("stdint.h;postproc/postprocess.h" HAVE_POSTPROC_POSTPROCESS_H)
vlc_enable_modules(ffmpeg)
vlc_add_module_compile_flag(ffmpeg ${FFmpeg_CFLAGS} )
vlc_module_add_link_libraries(ffmpeg ${FFmpeg_LIBRARIES})
find_package(Qt4)
if(QT4_FOUND)
set(HAVE_QT4 TRUE)
+ include_directories(${QT_INCLUDES})
vlc_check_include_files (qt.h)
vlc_enable_modules(qt4)
vlc_add_module_compile_flag(qt4 ${QT_CFLAGS} )
- vlc_module_add_link_libraries(qt4 ${QT_LIBRARIES} Qt4)
+ vlc_module_add_link_libraries(qt4 ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
+
+ # Define our own qt4_wrap_ui macro to match wanted behaviour
+ MACRO (VLC_QT4_WRAP_UI outfiles )
+ FOREACH (it ${ARGN})
+ string(REPLACE ".ui" ".h" outfile "${it}")
+ GET_FILENAME_COMPONENT(infile ${it} ABSOLUTE)
+ SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/${outfile})
+ ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
+ COMMAND mkdir -p `dirname ${outfile}`
+ COMMAND ${QT_UIC_EXECUTABLE}
+ ARGS -o ${outfile} ${infile}
+ MAIN_DEPENDENCY ${infile})
+ SET(${outfiles} ${${outfiles}} ${outfile})
+ ENDFOREACH (it)
+ ENDMACRO (VLC_QT4_WRAP_UI)
+
+ MACRO (VLC_QT4_GENERATE_MOC outfiles flags )
+ string(REGEX MATCHALL "[^\\ ]+" flags_list ${flags})
+ FOREACH (it ${ARGN})
+ string(REPLACE ".hpp" ".moc.cpp" outfile "${it}")
+ GET_FILENAME_COMPONENT(infile ${it} ABSOLUTE)
+ SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/${outfile})
+ ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
+ COMMAND mkdir -p `dirname ${outfile}`
+ COMMAND ${QT_MOC_EXECUTABLE}
+ ARGS ${flags_list}
+ ARGS -I ${CMAKE_BINARY_DIR}/include
+ ARGS -o ${outfile} ${infile}
+ MAIN_DEPENDENCY ${it}
+ )
+ SET(${outfiles} ${${outfiles}} ${outfile})
+ ENDFOREACH (it)
+ ENDMACRO (VLC_QT4_GENERATE_MOC)
+
+
endif(QT4_FOUND)
find_package(OpenGL)
vlc_module_add_link_libraries(opengl ${OPENGL_LIBRARIES})
endif(OPENGL_FOUND)
+find_package(Matroska 0.7.7)
+if(Matroska_FOUND)
+ vlc_enable_modules(mkv)
+ vlc_check_include_files (matroska/KaxAttachments.h)
+ vlc_check_include_files (matroska/KaxVersion.h)
+ vlc_module_add_link_libraries(mkv ${Matroska_LIBRARIES})
+endif(Matroska_FOUND)
+
+find_package(Live555)
+if(Live555_FOUND)
+ vlc_enable_modules(live555)
+ vlc_add_module_compile_flag(live555 ${Live555_CFLAGS})
+ vlc_module_add_link_libraries(live555 ${Live555_LIBRARIES})
+endif(Live555_FOUND)
+
+find_package(Curses)
+if(CURSES_LIBRARIES)
+ vlc_enable_modules(ncurses)
+ vlc_module_add_link_libraries(ncurses ${CURSES_LIBRARIES})
+endif(CURSES_LIBRARIES)
+
+find_package(X11)
+if(X11_FOUND)
+ vlc_enable_modules(x11 panoramix)
+ vlc_check_include_files (X11/Xlib.h)
+ vlc_module_add_link_libraries(x11 ${X11_LIBRARIES})
+ vlc_module_add_link_libraries(panoramix ${X11_LIBRARIES})
+endif(X11_FOUND)
+
+find_package(Mpeg2)
+if(Mpeg2_FOUND)
+ vlc_enable_modules(libmpeg2)
+ check_include_files ("stdint.h;mpeg2dec/mpeg2.h" HAVE_MPEG2DEC_MPEG2_H)
+ vlc_module_add_link_libraries(libmpeg2 ${Mpeg2_LIBRARIES})
+endif(Mpeg2_FOUND)
+
+find_package(Dvbpsi)
+if(Dvbpsi_FOUND)
+ vlc_enable_modules(ts)
+ set(CMAKE_REQUIRED_INCLUDES ${CONTRIB_INCLUDE})
+ 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})
+endif(Dvbpsi_FOUND)
+
+
+
set(CMAKE_REQUIRED_INCLUDES)
###########################################################
# Final configuration
###########################################################
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/include/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/include/config.h)
-
projects / vlc / blobdiff