Add QT4_GENERATE_MOCS macro to simplify test moc-ing

CMakeLists.txt

@@ -693,6 +693,13 @@ set(CMAKE_C_FLAGS ${CTK_C_FLAGS} CACHE STRING "CMake CXX Flags" FORCE)
 set(CTK_EXPORT_HEADER_TEMPLATE "${CTK_SOURCE_DIR}/Libs/ctkExport.h.in")
 
 #-----------------------------------------------------------------------------
+# Setup testing environment before Libs are added
+#
+IF(BUILD_TESTING)
+  ADD_SUBDIRECTORY(Libs/Testing)
+ENDIF()
+
+#-----------------------------------------------------------------------------
 # Add CTK library subdirectories
 #
 foreach(lib ${CTK_LIBS_SUBDIRS})

Libs/Testing/CMake/ctkMacroGenerateMocs.cmake

@@ -5,6 +5,7 @@ MACRO (QT4_GENERATE_MOCS)
 
   FOREACH (fileIt ${ARGN})
     QT4_GENERATE_MOC( ${fileIt} moc_${fileIt})
-  ENDFOREACH(it)
+    MACRO_ADD_FILE_DEPENDENCIES(${fileIt} moc_${fileIt})
+  ENDFOREACH(fileIt)
 
 ENDMACRO (QT4_GENERATE_MOCS)

Libs/Widgets/Testing/Cpp/CMakeLists.txt

@@ -116,9 +116,7 @@ set(Tests_MOC_SRCS
 
 set(Tests_MOC_CPP)
 QT4_WRAP_CPP(Tests_MOC_CPP ${Tests_MOC_SRCS})
-
-QT4_GENERATE_MOC(ctkRangeSliderTest.cpp moc_ctkRangeSliderTest.cpp)
-macro_add_file_dependencies(ctkRangeSliderTest.cpp moc_ctkRangeSliderTest.cpp)
+QT4_GENERATE_MOCS(ctkRangeSliderTest.cpp)
 
 add_executable(${KIT}CppTests ${Tests} ${Tests_SRCS} ${Tests_MOC_CPP})
 target_link_libraries(${KIT}CppTests ${LIBRARY_NAME})