From f5113ee3a669acf9ea8d24062a3e5fda20b72031 Mon Sep 17 00:00:00 2001
From: Jonathan Thomas <Jonathan.Oomph@gmail.com>
Date: Fri, 20 Dec 2013 18:22:13 -0600
Subject: [PATCH] Fixed Qt build errors by removing automoc

---
 CMakeLists.txt     |  4 ++++
 src/CMakeLists.txt | 19 ++++++++++++-------
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index eb81263e..78dcdd05 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 41f072f5..5924f546 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -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