cmake: Qt4 include directory.

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

diff --git a/extras/buildsystem/cmake/include/config.cmake b/extras/buildsystem/cmake/include/config.cmake
index 6946d3d66946ff9c943025ffded059cf4ec59750..c0980e6d764fd0ff8aa01cc5da35f2cdd7ddd691 100644 (file)
--- a/extras/buildsystem/cmake/include/config.cmake
+++ b/extras/buildsystem/cmake/include/config.cmake
@@ -181,7 +181,7 @@ if(NOT HAVE_CONNECT)
         vlc_module_add_link_libraries(libvlc connect)
         vlc_module_add_link_libraries(cdda   connect)
         vlc_module_add_link_libraries(cddax  connect)
-    endif(HAVE_CONNECT)
+    endif(NOT HAVE_CONNECT)
 endif(NOT HAVE_CONNECT)
 
 ###########################################################
@@ -196,7 +196,9 @@ if(APPLE)
     include( ${CMAKE_SOURCE_DIR}/cmake/vlc_find_frameworks.cmake )
 
     if(ENABLE_NO_SYMBOL_CHECK)
-        set(DYNAMIC_LOOKUP "-undefined dynamic_lookup" CACHE INTERNAL STRING)
+        set(DYNAMIC_LOOKUP "-undefined dynamic_lookup")
+    else(ENABLE_NO_SYMBOL_CHECK)
+        set(DYNAMIC_LOOKUP)
     endif(ENABLE_NO_SYMBOL_CHECK)
     set(CMAKE_SHARED_MODULE_CREATE_CXX_FLAGS
      "${CMAKE_SHARED_MODULE_CREATE_CXX_FLAGS} ${DYNAMIC_LOOKUP}")
@@ -371,6 +373,8 @@ 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)
   vlc_enable_modules(ffmpeg)
@@ -388,13 +392,24 @@ if(Lua_FOUND)
 endif(Lua_FOUND)
 
 find_package(Qt4)
-if(Qt4_FOUND)
+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 ${Qt4_CFLAGS} )
-  vlc_module_add_link_libraries(qt4 ${Qt4_LIBRARIES} Qt4)
-endif(Qt4_FOUND)
+  vlc_add_module_compile_flag(qt4 ${QT_CFLAGS} )
+  vlc_module_add_link_libraries(qt4 ${QT_LIBRARIES} Qt4)
+endif(QT4_FOUND)
+
+find_package(OpenGL)
+if(OPENGL_FOUND)
+  vlc_enable_modules(opengl)
+  vlc_check_include_files (gl/gl.h)
+  vlc_check_include_files (gl/glu.h)
+  vlc_check_include_files (gl/glx.h)
+  vlc_add_module_compile_flag(opengl ${OPENGL_CFLAGS})
+  vlc_module_add_link_libraries(opengl ${OPENGL_LIBRARIES})
+endif(OPENGL_FOUND)
 
 set(CMAKE_REQUIRED_INCLUDES)