From 689f1e18445c77e6bdd1015c925eb309d8b2ef4b Mon Sep 17 00:00:00 2001
From: Frank Dana <ferdnyc@gmail.com>
Date: Wed, 26 Feb 2020 17:24:56 -0500
Subject: [PATCH] CMake: Limit scope of AUTOMOC (#449)

- Only set AUTOMOC property on library target
- Only use the Qt headers in target_sources()
- Make Qt headers PRIVATE sources, to avoid migration to other targets
---
 src/CMakeLists.txt | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 619d78ed6..cc574b4a2 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -27,8 +27,6 @@
 # Collect and display summary of options/dependencies
 include(FeatureSummary)
 
-# Automatically process Qt classes with meta-object compiler
-set(CMAKE_AUTOMOC True)
 
 ################ WINDOWS ##################
 # Set some compiler options for Windows
@@ -190,9 +188,8 @@ set(QT_PLAYER_SOURCES
   Qt/VideoRenderer.cpp
   Qt/VideoRenderWidget.cpp)
 
-
-# Get list of headers
-file(GLOB_RECURSE headers ${CMAKE_SOURCE_DIR}/include/*.h)
+# Get list of MOC'able headers
+file(GLOB_RECURSE OPENSHOT_QT_HEADERS ${CMAKE_SOURCE_DIR}/include/Qt/*.h)
 
 # Disable RPATH
 SET(CMAKE_MACOSX_RPATH 0)
@@ -201,19 +198,20 @@ SET(CMAKE_MACOSX_RPATH 0)
 # Create shared openshot library
 add_library(openshot SHARED)
 
-target_sources(openshot
-  PRIVATE
-    ${OPENSHOT_SOURCES} ${EFFECTS_SOURCES} ${QT_PLAYER_SOURCES}
-  PUBLIC
-    ${headers})
+target_sources(openshot PRIVATE
+  ${OPENSHOT_SOURCES}
+  ${EFFECTS_SOURCES}
+  ${QT_PLAYER_SOURCES}
+  ${OPENSHOT_QT_HEADERS}
+  )
 
 # Set SONAME and other library properties
-set_target_properties(openshot
-		PROPERTIES
-		VERSION ${PROJECT_VERSION}
-		SOVERSION ${PROJECT_SO_VERSION}
-		INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib"
-		)
+set_target_properties(openshot PROPERTIES
+  AUTOMOC ON
+  VERSION ${PROJECT_VERSION}
+  SOVERSION ${PROJECT_SO_VERSION}
+  INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib"
+  )
 
 # Add optional ImageMagic-dependent sources
 if(ImageMagick_FOUND)