diff --git a/CMakeLists.txt b/CMakeLists.txt index c7c8e93..b5b6db0 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -156,6 +156,8 @@ IF( USE_FFMPEG ) SET( USE_FFMPEG FALSE ) ELSE() SET( CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} -D__STDC_CONSTANT_MACROS ) + INCLUDE_DIRECTORIES(${FFMPEG_INCLUDE_DIR} ${FFMPEG_INCLUDE_DIRS}) + SET( LINKER_LIBS ${LINKER_LIBS} ${FFMPEG_LIBRARIES} ) ENDIF() ENDIF() @@ -214,11 +216,6 @@ CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_D ADD_EXECUTABLE( ${PROJECT_NAME} ${SOURCES_FILES} ${HEADERS_MOC_FILES} ${FORMS_HEADERS_FILES} ${RESOURCES_RCC_FILES} ) -IF( USE_FFMPEG ) - INCLUDE_DIRECTORIES(${FFMPEG_INCLUDE_DIR} ${FFMPEG_INCLUDE_DIRS}) - SET( LINKER_LIBS ${LINKER_LIBS} ${FFMPEG_LIBRARIES} ) -ENDIF() -message( STATUS ${LINKER_LIBS} ) TARGET_LINK_LIBRARIES( ${PROJECT_NAME} ${LINKER_LIBS} ) IF( NOT USE_QT4)