Add dependency string into config

This commit is contained in:
jfmcarreira committed 2014-10-08 02:13:04 +01:00
1 parent 461307e44c
commit 021b1ce057
6 files changed
+15 -6

No files matched your search

+1
View File
@@ -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
+1
View File
@@ -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})
+7 -4
View File
@@ -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()
ENDIF()
+5 -1
View File
@@ -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 )
-1
View File
@@ -23,7 +23,6 @@ execute_process(
OUTPUT_STRIP_TRAILING_WHITESPACE
)
unset(__version_list)
unset(__version)
unset(__patch)
+1
View File
@@ -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