openshot/libopenshot
0
0
Fork 0
mirror of https://github.com/OpenShot/libopenshot.git synced 2026-03-02 08:53:52 -08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed Qt build errors by removing automoc

Browse Source
This commit is contained in:
Jonathan Thomas
2013-12-20 18:22:13 -06:00
parent d2017dd459
commit f5113ee3a6
2 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@@ -43,6 +43,10 @@ IF (WIN32)
SET_PROPERTY(GLOBAL PROPERTY WIN32 "WIN32")
ENDIF(WIN32)
############## FIND ALL QT RELATED HEADERS ##############
set(QT_HEADER_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include/Qt)
FILE(GLOB QT_HEADER_FILES "${QT_HEADER_DIR}/*.h")
############## PROCESS SUB-DIRECTORIES ##############
add_subdirectory(src)
add_subdirectory(tests)

19
src/CMakeLists.txt
View File

@@ -57,17 +57,17 @@ include_directories(${SDL_INCLUDE_DIR})
################# QT5 ###################
# As moc files are generated in the binary dir, tell CMake
# to always look for includes there:
set(CMAKE_INCLUDE_CURRENT_DIR ON)
#set(CMAKE_INCLUDE_CURRENT_DIR ON)
set(CMAKE_AUTOMOC ON)
#set(CMAKE_AUTOMOC ON)
#set (CMAKE_PREFIX_PATH "/usr/local/Cellar/qt5/5.1.1/")
# Find QT5 libraries
find_package(Qt5Widgets)
find_package(Qt5Core)
find_package(Qt5Gui)
find_package(Qt5Multimedia)
find_package(Qt5MultimediaWidgets)
find_package(Qt5Widgets REQUIRED)
find_package(Qt5Core REQUIRED)
find_package(Qt5Gui REQUIRED)
find_package(Qt5Multimedia REQUIRED)
find_package(Qt5MultimediaWidgets REQUIRED)
# Include Qt headers (needed for compile)
include_directories(${Qt5Widgets_INCLUDE_DIRS})
@@ -95,6 +95,10 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Gui_EXECUTABLE_COMPILE_FLAGS} ")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Multimedia_EXECUTABLE_COMPILE_FLAGS} ")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5MultimediaWidgets_EXECUTABLE_COMPILE_FLAGS} ")
# Manually moc Qt files
qt5_wrap_cpp(MOC_FILES ${QT_HEADER_FILES})
message('${MOC_FILES}')
################# BLACKMAGIC DECKLINK ###################
# Find BlackMagic DeckLinkAPI libraries
FIND_PACKAGE(BlackMagic)
@@ -163,6 +167,7 @@ SET ( OPENSHOT_SOURCE_FILES
# Qt Video Player
${QT_PLAYER_FILES}
${MOC_FILES}
# Third Party JSON Parser
../thirdparty/jsoncpp/src/lib_json/json_reader.cpp