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")
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)
+ add_definitions(-DDEBUG=1)
set(NDEBUG OFF)
endif(CMAKE_BUILD_TYPE STREQUAL "Debug")
set(CMAKE_EXTRA_INCLUDE_FILES)
set(CMAKE_EXTRA_INCLUDE_FILES arpa/inet.h)
-vlc_check_functions_exist(inet_pton inet_aton inet_ntop inet_pton)
+vlc_check_functions_exist(inet_aton inet_ntop inet_pton)
set(CMAKE_EXTRA_INCLUDE_FILES)
set(CMAKE_REQUIRED_LIBRARIES)
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(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(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} )
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_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)
+
set(CMAKE_REQUIRED_INCLUDES)
###########################################################
# Final configuration
###########################################################
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/include/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/include/config.h)
-