[vlmc-devel] commit: Add code to include frei0r. Refactor, add VLMC_LIBS to be used for linking multiple libraries. Add QtNetwork module, used in YouTube services. (Rohit Yadav )

git at videolan.org git at videolan.org
Tue Aug 17 14:23:01 CEST 2010


vlmc | branch: master | Rohit Yadav <rohityadav89 at gmail.com> | Thu Aug 12 00:22:16 2010 +0530| [ebff61408700b0a313a6be23d9faa3601149b2d9] | committer: Hugo Beauzée-Luyssen 

Add code to include frei0r. Refactor, add VLMC_LIBS to be used for linking multiple libraries. Add QtNetwork module, used in YouTube services.

Signed-off-by: Hugo Beauzée-Luyssen <beauze.h at gmail.com>

> http://git.videolan.org/gitweb.cgi/vlmc.git/?a=commit;h=ebff61408700b0a313a6be23d9faa3601149b2d9
---

 CMakeLists.txt |   19 +++++++++++++++++--
 1 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5841168..68192fd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -78,14 +78,29 @@ FIND_PACKAGE(LIBVLC)
 
 INCLUDE_DIRECTORIES(${LIBVLC_INCLUDE_DIR})
 
+FIND_PACKAGE(frei0r)
+IF (NOT FREI0R_FOUND)
+  MESSAGE (SEND_ERROR "frei0r not found! It is required for effects engine to work.")
+ENDIF (NOT FREI0R_FOUND)
+
+INCLUDE_DIRECTORIES(${FREI0R_INCLUDE_DIR})
+
 # search for Qt4
 IF (WITH_GUI)
-    FIND_PACKAGE(Qt4 4.5.1 COMPONENTS QtCore QtXml QtGui QtSvg REQUIRED )
+    FIND_PACKAGE (Qt4 4.5.1 COMPONENTS QtCore QtGui QtNetwork QtSvg QtXml REQUIRED)
 ELSE(WITH_GUI)
     # Search for QtGui as the effets engine requires QImage.
-    FIND_PACKAGE(Qt4 4.5.1 COMPONENTS QtCore QtXml QtGui REQUIRED )
+    FIND_PACKAGE (Qt4 4.5.1 COMPONENTS QtCore QtGui QtNetwork QtXml REQUIRED)
 ENDIF(WITH_GUI)
 
+SET (VLMC_LIBS ${QT_QTCORE_LIBRARY}
+          ${QT_QTGUI_LIBRARY}
+          ${QT_QTNETWORK_LIBRARY}
+          ${QT_QTSVG_LIBRARY}
+          ${QT_QTXML_LIBRARY}
+          ${LIBVLC_LIBRARY}
+          ${LIBVLCCORE_LIBRARY})
+
 INCLUDE(${QT_USE_FILE})
 ADD_DEFINITIONS(${QT_DEFINITIONS})
 



More information about the Vlmc-devel mailing list