[ros-diffs] [gedmurphy] 69321: [DEVMGR] - A few cmake fixes

Author: gedmurphy
Date: Tue Sep 22 21:44:19 2015
New Revision: 69321

URL: http://svn.reactos.org/svn/reactos?rev=69321&view=rev
Log:
[DEVMGR]
- A few cmake fixes

Modified:
    trunk/reactos/dll/win32/devmgr_new/CMakeLists.txt
    trunk/reactos/dll/win32/devmgr_new/properties/advprop.cpp
    trunk/reactos/dll/win32/devmgr_new/properties/devprblm.cpp
    trunk/reactos/dll/win32/devmgr_new/properties/hwpage.cpp
    trunk/reactos/dll/win32/devmgr_new/properties/hwresource.cpp
    trunk/reactos/dll/win32/devmgr_new/properties/misc.cpp
    trunk/reactos/dll/win32/devmgr_new/properties/properties.h
    trunk/reactos/dll/win32/devmgr_new/stdafx.h

Modified: trunk/reactos/dll/win32/devmgr_new/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/CMake…
==============================================================================
--- trunk/reactos/dll/win32/devmgr_new/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/devmgr_new/CMakeLists.txt	[iso-8859-1] Tue Sep 22 21:44:19
2015
@@ -3,7 +3,10 @@
 
 set_cpp(WITH_RTTI WITH_RUNTIME)
 
-include_directories(${REACTOS_SOURCE_DIR}/lib/atl includes devmgmt)
+include_directories(
+    ${REACTOS_SOURCE_DIR}/include/reactos/dll
+	${REACTOS_SOURCE_DIR}/lib/atl 
+	includes)
 
 list(APPEND SOURCE
     stdafx.h
@@ -13,7 +16,6 @@
     properties/hwpage.cpp
     properties/hwresource.cpp
     properties/misc.cpp
-    properties/stubs.cpp
     devmgmt/ClassNode.cpp
     devmgmt/DeviceNode.cpp
     devmgmt/DeviceView.cpp
@@ -30,4 +32,5 @@
 set_module_type(devmgr win32dll UNICODE)
 target_link_libraries(devmgr uuid atlnew wine)
 add_importlibs(devmgr setupapi advapi32 newdev user32 gdi32 comctl32 version msvcrt
kernel32 ole32 uxtheme ntdll)
+add_pch(devmgr stdafx.h SOURCE)
 add_cd_file(TARGET devmgr DESTINATION reactos/system32 FOR all)

Modified: trunk/reactos/dll/win32/devmgr_new/properties/advprop.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/prope…
==============================================================================
--- trunk/reactos/dll/win32/devmgr_new/properties/advprop.cpp	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/devmgr_new/properties/advprop.cpp	[iso-8859-1] Tue Sep 22
21:44:19 2015
@@ -28,7 +28,7 @@
  */
 
 #include "stdafx.h"
-#include <devmgr\devmgr.h>"
+#include <devmgr\devmgr.h>
 #include "properties.h"
 #include "resource.h"
 

Modified: trunk/reactos/dll/win32/devmgr_new/properties/devprblm.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/prope…
==============================================================================
--- trunk/reactos/dll/win32/devmgr_new/properties/devprblm.cpp	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/devmgr_new/properties/devprblm.cpp	[iso-8859-1] Tue Sep 22
21:44:19 2015
@@ -26,7 +26,7 @@
  */
 
 #include "stdafx.h"
-#include <devmgr\devmgr.h>"
+#include <devmgr\devmgr.h>
 #include "properties.h"
 #include "resource.h"
 

Modified: trunk/reactos/dll/win32/devmgr_new/properties/hwpage.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/prope…
==============================================================================
--- trunk/reactos/dll/win32/devmgr_new/properties/hwpage.cpp	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/devmgr_new/properties/hwpage.cpp	[iso-8859-1] Tue Sep 22
21:44:19 2015
@@ -26,7 +26,7 @@
  */
 
 #include "stdafx.h"
-#include <devmgr\devmgr.h>"
+#include <devmgr\devmgr.h>
 #include "properties.h"
 #include "resource.h"
 

Modified: trunk/reactos/dll/win32/devmgr_new/properties/hwresource.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/prope…
==============================================================================
--- trunk/reactos/dll/win32/devmgr_new/properties/hwresource.cpp	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/devmgr_new/properties/hwresource.cpp	[iso-8859-1] Tue Sep 22
21:44:19 2015
@@ -8,7 +8,7 @@
  */
 
 #include "stdafx.h"
-#include <devmgr\devmgr.h>"
+#include <devmgr\devmgr.h>
 #include "properties.h"
 #include "resource.h"
 

Modified: trunk/reactos/dll/win32/devmgr_new/properties/misc.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/prope…
==============================================================================
--- trunk/reactos/dll/win32/devmgr_new/properties/misc.cpp	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/devmgr_new/properties/misc.cpp	[iso-8859-1] Tue Sep 22
21:44:19 2015
@@ -26,7 +26,7 @@
  */
 
 #include "stdafx.h"
-#include <devmgr\devmgr.h>"
+#include <devmgr\devmgr.h>
 #include "properties.h"
 #include "resource.h"
 

Modified: trunk/reactos/dll/win32/devmgr_new/properties/properties.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/prope…
==============================================================================
--- trunk/reactos/dll/win32/devmgr_new/properties/properties.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/devmgr_new/properties/properties.h	[iso-8859-1] Tue Sep 22
21:44:19 2015
@@ -1,7 +1,7 @@
 #ifndef __DEVMGR_H
 #define __DEVMGR_H
 
-//WINE_DEFAULT_DEBUG_CHANNEL(devmgr);
+WINE_DEFAULT_DEBUG_CHANNEL(devmgr);
 
 extern HINSTANCE hDllInstance;
 

Modified: trunk/reactos/dll/win32/devmgr_new/stdafx.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/stdaf…
==============================================================================
--- trunk/reactos/dll/win32/devmgr_new/stdafx.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/devmgr_new/stdafx.h	[iso-8859-1] Tue Sep 22 21:44:19 2015
@@ -53,6 +53,8 @@
 #include <process.h>
 #include <WindowsX.h>
 #include <strsafe.h>
+#include <regstr.h>
+#include <newdevp.h>
 
 #include <setupapi.h>
 #include <commctrl.h>
@@ -64,4 +66,8 @@
 #include <atlstr.h>
 #include <atlcoll.h>
 
+#include <wine/debug.h>
+
+//WINE_DEFAULT_DEBUG_CHANNEL(devmgr);
+
 #endif