cmake: add QtAVWidget module

only common sources for all platforms
kiki1307 · Jan 22, 2017 · c54b769 · c54b769
1 parent a53f67b
commit c54b769
Show file tree

Hide file tree

Showing 3 changed files with 78 additions and 14 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -14,7  14,21 @@ find_package(Qt5Core REQUIRED)
 message(STATUS "Qt version: ${Qt5Core_VERSION_STRING}")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${QT5_CFLAGS}")
 
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
 if(POLICY CMP0063) # visibility. since 3.3
   cmake_policy(SET CMP0063 NEW)
 endif()
 set(CMAKE_CXX_VISIBILITY_PRESET hidden) #use with -fdata-sections -ffunction-sections to reduce target size
 set(CMAKE_VISIBILITY_INLINES_HIDDEN ON)
 
 set(CMAKE_AUTOMOC ON)
 
 add_subdirectory(src)
 find_package(Qt5Widgets)
 if(Qt5Widgets_FOUND)
   add_subdirectory(widgets)
 endif()
 
 #set(CMAKE_REQUIRED_INCLUDES ${Qt5WebEngine_INCLUDE_DIRS};${Qt5WebEngine_PRIVATE_INCLUDE_DIRS})
 #set(CMAKE_REQUIRED_LIBRARIES ${QT5_LIBRARIES})
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -1,11  1,11 @@
-
 set(MODULE QtAV)
 
 INCLUDE(CheckCCompilerFlag)
 INCLUDE(CheckIncludeFile)
 INCLUDE(CheckTypeSize)
 
 # set qt dirs first so we can find depends in qt install dir
-include_directories(${QTDIR}/include)
 include_directories(${QTDIR}/include) #TODO: remove. use external/include
 set(MODULES Core Gui)
 
 foreach(M ${MODULES})
@@ -43,7  43,7 @@ if(EXISTS ${CMAKE_SOURCE_DIR}/contrib/capi/capi.h)
 endif()
 
 # check ffmpeg headers. assume libs exist. lib order matters if they are static
-set(AVMODULES avformat avcodec swresample swscale avutil) # avdevice avfilter avresample swscale)
 set(AVMODULES avformat avcodec swscale avutil) # avdevice avfilter avresample swscale)
 # CMAKE_FIND_ROOT_PATH_BOTH: ensure find_file can search from given paths for cross compiling, may be set to ONLY in toolchain file
 foreach(av ${AVMODULES})
     string(TOUPPER ${av} AV)
@@ -181,7  181,7 @@ if (APPLE)
   endif()
 
   list(APPEND SOURCES output/audio/AudioOutputAudioToolbox.cpp)
-  list(APPEND EXTRA_LIBS "-framework CoreFoundation -framework AudioToolbox -framework OpenGL")
   list(APPEND EXTRA_LIBS "-framework CoreFoundation" "-framework AudioToolbox" "-framework OpenGL")
 endif()
 
 set(DEP_H  OPENAL VIDEOTOOLBOX)
@@ -326,7  326,7 @@ list(APPEND SOURCES
     output/video/VideoRenderer.cpp
     output/video/VideoOutput.cpp
     output/video/QPainterRenderer.cpp
-    output/video/OpenGLRendererBase.cpp
     output/video/OpenGLRendererBase.cpp #TODO: check opengl
     output/video/OpenGLWindowRenderer.cpp
     output/AVOutput.cpp
     output/OutputSet.cpp
@@ -341,7  341,7 @@ list(APPEND SOURCES
     VideoFrameExtractor.cpp
     )
 
-aux_source_directory(opengl SRC_OPENGL)
 aux_source_directory(opengl SRC_OPENGL) #TODO: check qt opengl support, egl
 list(APPEND SOURCES ${SRC_OPENGL})
 list(APPEND HEADERS ${SDK_HEADERS} ${SDK_PRIVATE_HEADERS}
     AVPlayerPrivate.h
@@ -369,21  369,22 @@ list(APPEND HEADERS ${SDK_HEADERS} ${SDK_PRIVATE_HEADERS}
     ColorTransform.h
     )
 
-SET(RESOURCES QtAV.qrc shaders/shaders.qrc)
 SET(RESOURCES ${MODULE}.qrc shaders/shaders.qrc)
 SOURCE_GROUP("Resources" FILES ${RESOURCES})
 QT5_ADD_RESOURCES(RESOURCES_SOURCES ${RESOURCES})
 set_source_files_properties(${RESOURCES_SOURCES} PROPERTIES GENERATED ON)
 
 # add HEADERS for moc
-add_library(QtAV SHARED ${SOURCES} ${RESOURCES_SOURCES} ${HEADERS})
-qt5_use_modules(QtAV Core Gui)
-target_link_libraries(QtAV ${EXTRA_LIBS})
-set_target_properties(QtAV PROPERTIES
 add_library(${MODULE} SHARED ${SOURCES} ${RESOURCES_SOURCES} ${HEADERS})
 qt5_use_modules(${MODULE} LINK_PUBLIC Core Gui)
 list(REMOVE_DUPLICATES EXTRA_LIBS)
 target_link_libraries(${MODULE} LINK_PRIVATE ${EXTRA_LIBS})
 set_target_properties(${MODULE} PROPERTIES
   MACOSX_RPATH ON
   FRAMEWORK ON
   VERSION ${PROJECT_VERSION}
   SOVERSION ${SO_VERSION}
-  OUTPUT_NAME "QtAV"
   OUTPUT_NAME ${MODULE}
   CLEAN_DIRECT_OUTPUT 1
   #LINK_SEARCH_START_STATIC 1
 )
@@ -392,11  393,11 @@ set_target_properties(QtAV PROPERTIES
 #http://stackoverflow.com/questions/19866424/cmake-and-qt5-automoc-error
 #http://doc.qt.io/qt-5/cmake-manual.html
 set(CMAKE_INCLUDE_CURRENT_DIR ON) # for .moc
-target_include_directories(QtAV
 target_include_directories(${MODULE}
   PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${EXTRA_INCLUDE}
   )
 
-target_compile_definitions(QtAV
 target_compile_definitions(${MODULE}
   PRIVATE ${EXTRA_DEFS}
 )
diff --git a/widgets/CMakeLists.txt b/widgets/CMakeLists.txt
@@ -0,0  1,49 @@
 set(MODULE QtAVWidgets)
 set(SDK_HEADERS
   QtAVWidgets/global.h
   QtAVWidgets/GLWidgetRenderer2.h #TODO: check opengl
   QtAVWidgets/GraphicsItemRenderer.h
   QtAVWidgets/OpenGLWidgetRenderer.h
   QtAVWidgets/QtAVWidgets
   QtAVWidgets/QtAVWidgets.h
   QtAVWidgets/version.h
   QtAVWidgets/VideoPreviewWidget.h
   QtAVWidgets/WidgetRenderer.h
 )
 set(HEADERS ${SDK_HEADERS})
 list(APPEND SOURCES
   global.cpp
   GLWidgetRenderer2.cpp
   GraphicsItemRenderer.cpp
   OpenGLWidgetRenderer.cpp
   VideoPreviewWidget.cpp
   WidgetRenderer.cpp
 )
 # add HEADERS for moc
 add_library(${MODULE} SHARED ${SOURCES} ${RESOURCES_SOURCES} ${HEADERS})
 qt5_use_modules(${MODULE} LINK_PUBLIC Core Gui Widgets OpenGL) #TODO: check OpenGL
 target_link_libraries(${MODULE} LINK_PRIVATE ${EXTRA_LIBS})
 target_link_libraries(${MODULE} LINK_PUBLIC QtAV)
 set_target_properties(${MODULE} PROPERTIES
   MACOSX_RPATH ON
   FRAMEWORK ON
   VERSION ${PROJECT_VERSION}
   SOVERSION ${SO_VERSION}
   OUTPUT_NAME ${MODULE}
   CLEAN_DIRECT_OUTPUT 1
   #LINK_SEARCH_START_STATIC 1
 )
 
 
 #http://stackoverflow.com/questions/19866424/cmake-and-qt5-automoc-error
 #http://doc.qt.io/qt-5/cmake-manual.html
 set(CMAKE_INCLUDE_CURRENT_DIR ON) # for .moc
 target_include_directories(${MODULE}
   PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
   PUBLIC ${CMAKE_SOURCE_DIR}/src
   PRIVATE ${EXTRA_INCLUDE}
   )
 
 target_compile_definitions(QtAV
   PRIVATE ${EXTRA_DEFS}
 )