[ros-diffs] [akhaldi] 52427: [CMAKE] * Add urlmon back to msvc build, but not into bootcd. * Add back cryptui, oleaut32 and shlwapi as a result.

Author: akhaldi
Date: Wed Jun 22 17:33:22 2011
New Revision: 52427

URL: http://svn.reactos.org/svn/reactos?rev=52427&view=rev
Log:
[CMAKE]
* Add urlmon back to msvc build, but not into bootcd.
* Add back cryptui, oleaut32 and shlwapi as a result.

Modified:
    trunk/reactos/dll/win32/CMakeLists.txt
    trunk/reactos/dll/win32/urlmon/CMakeLists.txt

Modified: trunk/reactos/dll/win32/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/CMakeLists.txt?r…
==============================================================================
--- trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] Wed Jun 22 17:33:22 2011
@@ -27,9 +27,7 @@
 add_subdirectory(cryptdlg)
 add_subdirectory(cryptdll)
 add_subdirectory(cryptnet)
-if(NOT MSVC)
-    add_subdirectory(cryptui) # FIXME: msvc build.
-endif()
+add_subdirectory(cryptui)
 add_subdirectory(dbghelp)
 add_subdirectory(dciman32)
 add_subdirectory(devmgr)
@@ -136,9 +134,7 @@
 add_subdirectory(odbccp32)
 add_subdirectory(ole32)
 add_subdirectory(oleacc)
-if(NOT MSVC)
-    add_subdirectory(oleaut32) # FIXME: msvc build.
-endif()
+add_subdirectory(oleaut32)
 add_subdirectory(olecli32)
 add_subdirectory(oledlg)
 add_subdirectory(olepro32)
@@ -184,9 +180,7 @@
 add_subdirectory(shell32)
 add_subdirectory(shfolder)
 add_subdirectory(shimgvw)
-if(NOT MSVC)
-    add_subdirectory(shlwapi) # FIXME: msvc build.
-endif()
+add_subdirectory(shlwapi)
 add_subdirectory(slbcsp)
 add_subdirectory(smdll)
 add_subdirectory(sndblst)
@@ -213,9 +207,7 @@
 add_subdirectory(untfs)
 add_subdirectory(updspapi)
 add_subdirectory(url)
-if(NOT MSVC)
-    add_subdirectory(urlmon) # FIXME: msvc build.
-endif()
+add_subdirectory(urlmon)
 add_subdirectory(user32)
 add_subdirectory(userenv)
 add_subdirectory(usp10)

Modified: trunk/reactos/dll/win32/urlmon/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/CMakeList…
==============================================================================
--- trunk/reactos/dll/win32/urlmon/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/urlmon/CMakeLists.txt [iso-8859-1] Wed Jun 22 17:33:22 2011
@@ -72,5 +72,8 @@
 

add_definitions(-DPROXY_CLSID_IS="{0x79EAC9F1,0xBAF9,0x11CE,{0x8C,0x82,0x00,0xAA,0x00,0x4B,0xA9,0x0B}}")
 
-add_cd_file(TARGET urlmon DESTINATION reactos/system32 FOR all)
+if(NOT MSVC)
+    # FIXME: msvc build
+    add_cd_file(TARGET urlmon DESTINATION reactos/system32 FOR all)
+endif()
 add_importlib_target(urlmon.spec)