From 021b1ce057545278887b6f2a360724b261230ad9 Mon Sep 17 00:00:00 2001 From: Joao Carreira Date: Wed, 8 Oct 2014 02:13:04 +0100 Subject: [PATCH] Add dependency string into config --- CMakeLists.txt | 1 + cmake/LibFFmpeg.cmake | 1 + cmake/LibOpenCV.cmake | 11 +++++++---- cmake/LibQT.cmake | 6 +++++- cmake/PlaYUVerVersion.cmake | 1 - config.h.in | 1 + 6 files changed, 15 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5af4797..b697fa3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -105,6 +105,7 @@ file( APPEND ${CMAKE_CURRENT_BINARY_DIR}/ModulesListHeader.h "#endif // __MODU ###################################################################################### CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h ) CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/cmake/PlaYUVerConfig.cmake.in ${CMAKE_BINARY_DIR}/PlaYUVerConfig.cmake @ONLY) +CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/cmake/PlaYUVerUpdate.xml.in ${CMAKE_BINARY_DIR}/PlaYUVerUpdate.xml @ONLY) ###################################################################################### # Target App diff --git a/cmake/LibFFmpeg.cmake b/cmake/LibFFmpeg.cmake index 7075741..e59195c 100644 --- a/cmake/LibFFmpeg.cmake +++ b/cmake/LibFFmpeg.cmake @@ -108,6 +108,7 @@ IF( USE_FFMPEG ) IF( NOT FFMPEG_FOUND ) SET( USE_FFMPEG FALSE ) ELSE() + SET( DEPENDENCIES_STRING "${DEPENDENCIES_STRING}FFMPEG" ) INCLUDE_DIRECTORIES( ${LIB_DIR}/ffmpeg ) #SET( CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} -D__STDC_CONSTANT_MACROS ) INCLUDE_DIRECTORIES(${FFMPEG_INCLUDE_DIR} ${FFMPEG_INCLUDE_DIRS}) diff --git a/cmake/LibOpenCV.cmake b/cmake/LibOpenCV.cmake index 1437796..acd36fa 100644 --- a/cmake/LibOpenCV.cmake +++ b/cmake/LibOpenCV.cmake @@ -5,11 +5,14 @@ IF( USE_OPENCV ) FIND_PACKAGE( OpenCV ) IF( NOT OpenCV_FOUND) - SET(USE_OPENCV FALSE) + SET(USE_OPENCV FALSE) ELSE() - LIST(APPEND LINKER_LIBS ${OpenCV_LIBRARIES} ) + LIST(APPEND LINKER_LIBS ${OpenCV_LIBRARIES} ) ENDIF() - +ENDIF() + +IF( USE_OPENCV ) + SET( DEPENDENCIES_STRING "${DEPENDENCIES_STRING}OPENCV" ) IF( WIN32 ) SET(OpenCV_DLL_DIR "${OpenCV_DIR}/bin" CACHE PATH "Where to find OpenCV dlls") INSTALL(FILES ${OpenCV_DLL_DIR}/opencv_core${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH}.dll DESTINATION bin ) @@ -31,4 +34,4 @@ IF( USE_OPENCV ) INSTALL(FILES ${OpenCV_DLL_DIR}/opencv_legacy${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH}.dll DESTINATION bin ) INSTALL(FILES ${OpenCV_DLL_DIR}/opencv_gpu${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH}.dll DESTINATION bin ) ENDIF() -ENDIF() \ No newline at end of file +ENDIF() diff --git a/cmake/LibQT.cmake b/cmake/LibQT.cmake index 99944ff..aa1a25a 100644 --- a/cmake/LibQT.cmake +++ b/cmake/LibQT.cmake @@ -9,7 +9,9 @@ IF( WIN32 ) ENDIF() IF( USE_QT4 ) - + + SET( DEPENDENCIES_STRING "${DEPENDENCIES_STRING}QT4" ) + FIND_PACKAGE( Qt4 REQUIRED QtCore QtGui QtNetwork QtWebKit ) IF( NOT QT4_FOUND) SET(USE_QT4 FALSE) @@ -25,6 +27,8 @@ ENDIF() IF( NOT USE_QT4 ) + SET( DEPENDENCIES_STRING "${DEPENDENCIES_STRING}QT5" ) + FIND_PACKAGE( Qt5Core REQUIRED ) FIND_PACKAGE( Qt5Gui REQUIRED ) FIND_PACKAGE( Qt5Widgets REQUIRED ) diff --git a/cmake/PlaYUVerVersion.cmake b/cmake/PlaYUVerVersion.cmake index 7da6349..b24634f 100644 --- a/cmake/PlaYUVerVersion.cmake +++ b/cmake/PlaYUVerVersion.cmake @@ -23,7 +23,6 @@ execute_process( OUTPUT_STRIP_TRAILING_WHITESPACE ) - unset(__version_list) unset(__version) unset(__patch) diff --git a/config.h.in b/config.h.in index eced5f1..5174a01 100644 --- a/config.h.in +++ b/config.h.in @@ -33,6 +33,7 @@ #define PLAYUVER_VERSION @PLAYUVER_VERSION@ #define PLAYUVER_VERSION_STRING "@PLAYUVER_VERSION@" +#define DEPENDENCIES_STRING @DEPENDENCIES_STRING@ /* QT definition */ #cmakedefine USE_QT4