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 7dbae80aa88fb0b897bcb55b7d936cb00354c568..6f3c8fecb45b9c88a9b3685d947c7b906d2ffa5d 100644 (file)
--- a/extras/buildsystem/cmake/include/config.cmake
+++ b/extras/buildsystem/cmake/include/config.cmake
@@ -41,6 +41,7 @@ endif(NOT CMAKE_BUILD_TYPE )
 
 if(CMAKE_BUILD_TYPE STREQUAL "Debug")
     set(DEBUG ON)
+    add_definitions(-DDEBUG=1)
     set(NDEBUG OFF)
 endif(CMAKE_BUILD_TYPE STREQUAL "Debug")
 
@@ -179,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)
@@ -213,7 +214,7 @@ if(APPLE)
 
     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")
@@ -226,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}
@@ -248,6 +250,11 @@ if(APPLE)
     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} )
 
@@ -286,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 )
@@ -473,4 +480,3 @@ set(CMAKE_REQUIRED_INCLUDES)
 # Final configuration
 ###########################################################
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/include/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/include/config.h)
-