cmake: Increment my commit count :/ (oops).

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

diff --git a/extras/buildsystem/cmake/include/config.cmake b/extras/buildsystem/cmake/include/config.cmake
index a409a365fb9f41562feca0d4904d9e0fa3f42dc6..6f3c8fecb45b9c88a9b3685d947c7b906d2ffa5d 100644 (file)
--- a/extras/buildsystem/cmake/include/config.cmake
+++ b/extras/buildsystem/cmake/include/config.cmake
@@ -33,7 +33,7 @@ OPTION( ENABLE_HTTPD           "Enable httpd server" ON )
 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 )
@@ -41,7 +41,8 @@ endif(NOT CMAKE_BUILD_TYPE )
 
 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})
@@ -114,7 +115,7 @@ 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_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)
@@ -139,7 +140,6 @@ check_c_source_compiles (
 
 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)
 
@@ -180,7 +180,7 @@ endif (HAVE_LIBM)
 
 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)
@@ -209,9 +209,15 @@ if(APPLE)
     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 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)
@@ -221,7 +227,8 @@ if(APPLE)
    # 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}
@@ -243,8 +250,13 @@ if(APPLE)
     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)
@@ -281,7 +293,7 @@ macro(command_to_configvar command var)
   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 )
@@ -419,6 +431,7 @@ if(QT4_FOUND)
   vlc_enable_modules(qt4)
   vlc_add_module_compile_flag(qt4 ${QT_CFLAGS} )
   vlc_module_add_link_libraries(qt4 ${QT_LIBRARIES})
+
   # Define our own qt4_wrap_ui macro to match wanted behaviour
   MACRO (VLC_QT4_WRAP_UI outfiles )
     FOREACH (it ${ARGN})
@@ -432,7 +445,6 @@ if(QT4_FOUND)
         MAIN_DEPENDENCY ${infile})
       SET(${outfiles} ${${outfiles}} ${outfile})
     ENDFOREACH (it)
-
   ENDMACRO (VLC_QT4_WRAP_UI)
 
 endif(QT4_FOUND)
@@ -447,10 +459,24 @@ if(OPENGL_FOUND)
   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 0.7.7)
+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)
+
 set(CMAKE_REQUIRED_INCLUDES)
 
 ###########################################################
 # Final configuration
 ###########################################################
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/include/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/include/config.h)
-