From 2e36fe5e4e473ccfdc6b427f376889ec3ae617c7 Mon Sep 17 00:00:00 2001 From: J Carreira Date: Tue, 10 Jun 2014 23:12:54 +0100 Subject: [PATCH] fix last commit --- cmake/Install.cmake | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/cmake/Install.cmake b/cmake/Install.cmake index 5a6feb0..c6a2aca 100644 --- a/cmake/Install.cmake +++ b/cmake/Install.cmake @@ -75,16 +75,5 @@ IF( USE_FFMPEG ) LIST(APPEND CPACK_DEBIAN_PACKAGE_DEPENDS ",") LIST(APPEND CPACK_DEBIAN_PACKAGE_DEPENDS "libavformat53 (>= 6:0.8.10~), libcodec53 (>= 6:0.8.3-1~), libavutil51 (>= 6:0.8.3-1~)") ENDIF() -<<<<<<< HEAD -IF( USE_OPENCV ) - SET(CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS}") -ENDIF() -SET(CPACK_PACKAGE_DESCRIPTION "plaYUVer is an open-source QT based raw video player") -SET(CPACK_PACKAGE_CONTACT "Joao Carreira (jfmcarreira@gmail.com), Luis Lucas (luisfrlucas@gmail.com)") -# set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_CURRENT_SOURCE_DIR}/Debian/postinst") -======= - - ->>>>>>> master INCLUDE(CPack)