patch-3983.diff
Public
Actions

Authored By

	maleike
	May 7 2010, 10:17 AM

Size

1 KB

Referenced Files

None

Subscribers

None

patch-3983.diff
View Options

	Index: CoreHelpers.cmake
	===================================================================
	--- CoreHelpers.cmake (revision 22749)
	+++ CoreHelpers.cmake (working copy)
	@@ -377,9 +377,15 @@
	MACRO(MITK_CREATE_MODULE_TESTS)
	MACRO_PARSE_ARGUMENTS(MODULE_TEST "EXTRA_DRIVER_INIT;EXTRA_DRIVER_INCLUDE" "" ${ARGN})
	IF(BUILD_TESTING AND MODULE_IS_ENABLED)
	+ SET(OLD_MOC_H_FILES ${MOC_H_FILES})
	+ SET(MOC_H_FILES)
	INCLUDE(files.cmake)
	INCLUDE_DIRECTORIES(.)

	+ IF(DEFINED MOC_H_FILES)
	+ QT4_WRAP_CPP(MODULE_TEST_GENERATED_MOC_CPP ${MOC_H_FILES})
	+ ENDIF(DEFINED MOC_H_FILES)
	+
	SET(CMAKE_TESTDRIVER_BEFORE_TESTMAIN "mitk::LogBackend::Register(); ${MODULE_TEST_EXTRA_DRIVER_INIT};")
	SET(CMAKE_TESTDRIVER_AFTER_TESTMAIN "mitk::LogBackend::Unregister();")
	IF(NOT MODULE_TEST_EXTRA_DRIVER_INCLUDE)
	@@ -391,7 +397,7 @@
	EXTRA_INCLUDE ${MODULE_TEST_EXTRA_DRIVER_INCLUDE}
	)
	SET(TESTDRIVER ${MODULE_NAME}TestDriver)
	- ADD_EXECUTABLE(${TESTDRIVER} ${MODULETEST_SOURCE})
	+ ADD_EXECUTABLE(${TESTDRIVER} ${MODULETEST_SOURCE} ${MODULE_TEST_GENERATED_MOC_CPP})
	TARGET_LINK_LIBRARIES(${TESTDRIVER} ${MODULE_PROVIDES} ${ALL_LIBRARIES})
	#
	# Now tell CMake which tests should be run. This is done automatically
	@@ -423,6 +429,7 @@
	ENDIF(EXISTS ${IMAGE_FULL_PATH})
	ENDFOREACH( image )

	+ SET(MOC_H_FILES ${OLD_MOC_H_FILES})
	ENDIF(BUILD_TESTING AND MODULE_IS_ENABLED)

	ENDMACRO(MITK_CREATE_MODULE_TESTS)

Attached To	Mode
T3983: allow moc-ing / add MOC_H_FILES for test drivers	Attached	Detach File

Changes to CoreHelpers.cmake to evaluate MOC_H_FILES