Index: tests/CMakeLists.txt
===================================================================
--- tests/CMakeLists.txt	(revision 505)
+++ tests/CMakeLists.txt	(working copy)
@@ -75,8 +75,22 @@
     ENDIF(ENABLE_MQ)
 
     # Copy over CPF files. It *must* be done like this to work on MSVC:
-    add_custom_target(SetupTests ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/testPropMarshVectLegacy.cpf ${CMAKE_CFG_INTDIR}
-                      COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/property_loading.cpf ${CMAKE_CFG_INTDIR})
+	add_custom_target(SetupTests)
+	if(WIN32)
+    add_custom_command(TARGET SetupTests 
+					   PRE_BUILD
+						COMMAND mkdir -p ${CMAKE_CFG_INTDIR}
+						COMMAND copy ${CMAKE_CURRENT_SOURCE_DIR}/testPropMarshVectLegacy.cpf ${CMAKE_CFG_INTDIR}
+						COMMAND copy ${CMAKE_CURRENT_SOURCE_DIR}/property_loading.cpf ${CMAKE_CFG_INTDIR}						
+						)
+	else(WIN32)
+	add_custom_command(TARGET SetupTests 
+					   PRE_BUILD
+						COMMAND mkdir -p ${CMAKE_CFG_INTDIR}
+						COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/testPropMarshVectLegacy.cpf ${CMAKE_CFG_INTDIR}
+						COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/property_loading.cpf ${CMAKE_CFG_INTDIR}						
+						)
+	endif(WIN32)
 
     ADD_EXECUTABLE( main-test test-main.cpp )
     TARGET_LINK_LIBRARIES( main-test orocos-rtt-${OROCOS_TARGET}_dynamic)