cmake: remove unneeded checks.

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

diff --git a/extras/buildsystem/cmake/include/config.cmake b/extras/buildsystem/cmake/include/config.cmake
index d65c1d8249514eb381c7dd8f3896b4eb690f26ad..545dcebedfb070c6f5dd52cc5f931e868a6c2db1 100644 (file)
--- a/extras/buildsystem/cmake/include/config.cmake
+++ b/extras/buildsystem/cmake/include/config.cmake
@@ -18,10 +18,12 @@ set(VLC_VERSION_MAJOR 0)
 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")
 
@@ -41,6 +43,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")
 
@@ -213,14 +216,15 @@ 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 auhal)
+    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)
@@ -466,13 +470,27 @@ if(Matroska_FOUND)
   vlc_module_add_link_libraries(mkv ${Matroska_LIBRARIES})
 endif(Matroska_FOUND)
 
-find_package(Live555 0.7.7)
+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)
 
 ###########################################################