From 2a447311feec882d2dfcc9f9f871d7c7bed3d25e Mon Sep 17 00:00:00 2001
From: Thomas Faber <thomas.faber@reactos.org>
Date: Thu, 8 Sep 2011 10:25:40 +0000
Subject: [PATCH] [KMTESTS] - Use new CMake macros in separate drivers, too -
 Use kmtest_.exe filename for rbuild too

svn path=/branches/GSoC_2011/KMTestSuite/; revision=53637
---
 kmtests/example/CMakeLists.txt | 3 ++-
 kmtests/kmtest.rbuild          | 2 +-
 kmtests/ntos_io/CMakeLists.txt | 6 ++++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/kmtests/example/CMakeLists.txt b/kmtests/example/CMakeLists.txt
index f552d62e7a4..1ea27859ac5 100644
--- a/kmtests/example/CMakeLists.txt
+++ b/kmtests/example/CMakeLists.txt
@@ -10,6 +10,7 @@ add_library(example_drv SHARED ${EXAMPLE_DRV_SOURCE})
 set_module_type(example_drv kernelmodedriver)
 target_link_libraries(example_drv kmtest_printf ${PSEH_LIB})
 add_importlibs(example_drv ntoskrnl hal)
-set_property(TARGET example_drv PROPERTY COMPILE_DEFINITIONS KMT_STANDALONE_DRIVER)
+add_target_compile_definitions(example_drv KMT_STANDALONE_DRIVER)
+#add_pch(example_drv ../include/kmt_test.h)
 
 add_cd_file(TARGET example_drv DESTINATION reactos/bin FOR all)
diff --git a/kmtests/kmtest.rbuild b/kmtests/kmtest.rbuild
index 46f3d23a0fa..67c3f0b5101 100644
--- a/kmtests/kmtest.rbuild
+++ b/kmtests/kmtest.rbuild
@@ -1,4 +1,4 @@
-<module name="kmtest" type="win32cui" installbase="bin" installname="kmtest.exe">
+<module name="kmtest" type="win32cui" installbase="bin" installname="kmtest_.exe">
 	<include base="kmtest">include</include>
 	<library>advapi32</library>
 	<library>ntdll</library>
diff --git a/kmtests/ntos_io/CMakeLists.txt b/kmtests/ntos_io/CMakeLists.txt
index 9b0640d7788..af43acfcdb2 100644
--- a/kmtests/ntos_io/CMakeLists.txt
+++ b/kmtests/ntos_io/CMakeLists.txt
@@ -13,7 +13,8 @@ add_library(iodeviceobject_drv SHARED ${IODEVICEOBJECT_DRV_SOURCE})
 set_module_type(iodeviceobject_drv kernelmodedriver)
 target_link_libraries(iodeviceobject_drv kmtest_printf ${PSEH_LIB})
 add_importlibs(iodeviceobject_drv ntoskrnl hal)
-set_property(TARGET iodeviceobject_drv PROPERTY COMPILE_DEFINITIONS KMT_STANDALONE_DRIVER)
+add_target_compile_definitions(iodeviceobject_drv KMT_STANDALONE_DRIVER)
+#add_pch(iodeviceobject_drv ../include/kmt_test.h)
 
 add_cd_file(TARGET iodeviceobject_drv DESTINATION reactos/bin FOR all)
 
@@ -29,6 +30,7 @@ add_library(iohelper_drv SHARED ${IOHELPER_DRV_SOURCE})
 set_module_type(iohelper_drv kernelmodedriver)
 target_link_libraries(iohelper_drv kmtest_printf ${PSEH_LIB})
 add_importlibs(iohelper_drv ntoskrnl hal)
-set_property(TARGET iohelper_drv PROPERTY COMPILE_DEFINITIONS KMT_STANDALONE_DRIVER)
+add_target_compile_definitions(iohelper_drv KMT_STANDALONE_DRIVER)
+#add_pch(iohelper_drv ../include/kmt_test.h)
 
 add_cd_file(TARGET iohelper_drv DESTINATION reactos/bin FOR all)