cmake: Simplify build-system leveraging AUTOMOC capability

Author: jcfr

CMakeLists.txt

@@ -133,10 +133,6 @@ foreach(qt_component ${qt_required_components})
   list(APPEND QT_LIBRARIES Qt5::${qt_component})
 endforeach()
 
-macro(pythonqt_wrap_cpp)
-  qt5_wrap_cpp(${ARGV})
-endmacro()
-
 if(UNIX)
   find_package(OpenGL)
   if(OPENGL_FOUND)
@@ -222,19 +218,6 @@ set(headers
     generated_cpp${generated_cpp_suffix}/PythonQt_QtBindings.h
 )
 
-#-----------------------------------------------------------------------------
-# Headers that should run through moc
-
-set(moc_sources
-    src/PythonQt.h
-    src/PythonQtSignalReceiver.h
-    src/PythonQtStdDecorators.h
-    src/gui/PythonQtScriptingConsole.h
-
-    generated_cpp${generated_cpp_suffix}/com_trolltech_qt_core_builtin/com_trolltech_qt_core_builtin0.h
-    generated_cpp${generated_cpp_suffix}/com_trolltech_qt_gui_builtin/com_trolltech_qt_gui_builtin0.h
-)
-
 #-----------------------------------------------------------------------------
 # Add extra sources
 
@@ -255,11 +238,6 @@ foreach(qtlib ${qtlibs})
         list(APPEND sources ${file_prefix}${index}.cpp)
       endif()
 
-      # Headers that should run through moc
-      if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file_prefix}${index}.h)
-        list(APPEND moc_sources ${file_prefix}${index}.h)
-      endif()
-
     endforeach()
 
     list(APPEND sources ${file_prefix}_init.cpp)
@@ -284,19 +262,17 @@ list(APPEND headers
   ${CMAKE_CURRENT_BINARY_DIR}/src/PythonQtConfigure.h
   )
 
-#-----------------------------------------------------------------------------
-# Do wrapping
-pythonqt_wrap_cpp(gen_moc_sources ${moc_sources})
-
 #-----------------------------------------------------------------------------
 # Build the library
 
-add_library(PythonQt SHARED
-            ${sources}
-            ${gen_moc_sources}
-  )
+add_library(PythonQt SHARED ${sources})
 set_target_properties(PythonQt PROPERTIES DEFINE_SYMBOL PYTHONQT_EXPORTS)
 
+set_target_properties(PythonQt
+  PROPERTIES
+    AUTOMOC TRUE
+  )
+
 target_compile_definitions(PythonQt
   PRIVATE
     $<$<BOOL:${PythonQt_DEBUG}>:PYTHONQT_DEBUG>
@@ -352,18 +328,11 @@ if(BUILD_TESTING)
     tests/PythonQtTests.h
     )
 
-  pythonqt_wrap_cpp(test_sources
-    tests/PythonQtTests.h
-    )
-
   if(PythonQt_Wrap_QtCore)
     list(APPEND test_sources
       tests/PythonQtTestCleanup.cpp
       tests/PythonQtTestCleanup.h
       )
-    pythonqt_wrap_cpp(test_sources
-      tests/PythonQtTestCleanup.h
-      )
 
     set_property(SOURCE tests/PythonQtTestMain.cpp APPEND PROPERTY COMPILE_DEFINITIONS "PythonQt_Wrap_QtCore")
   endif()
@@ -377,6 +346,11 @@ if(BUILD_TESTING)
 
   target_link_libraries(PythonQtCppTests PythonQt)
 
+  set_target_properties(PythonQtCppTests
+    PROPERTIES
+      AUTOMOC TRUE
+    )
+
   target_compile_definitions(PythonQtCppTests
     PRIVATE
       $<$<BOOL:${PythonQt_SUPPORT_NAME_PROPERTY}>:PYTHONQT_SUPPORT_NAME_PROPERTY>