[ros-diffs] [tkreuzer] 52493: [CMAKE] Add hlink and msi importlib to MSVC build

[tkreuzer at svn.reactos.org]

Author: tkreuzer
Date: Thu Jun 30 16:03:41 2011
New Revision: 52493

URL: http://svn.reactos.org/svn/reactos?rev=52493&view=rev
Log:
[CMAKE]
Add hlink and msi importlib to MSVC build

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

Modified: trunk/reactos/dll/win32/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/CMakeLists.txt?rev=52493&r1=52492&r2=52493&view=diff
==============================================================================
--- trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] Thu Jun 30 16:03:41 2011
@@ -43,9 +43,7 @@
 add_subdirectory(glu32)
 add_subdirectory(hhctrl.ocx)
 add_subdirectory(hid)
-if(NOT MSVC)
-    add_subdirectory(hlink) # FIXME: msvc build.
-endif()
+add_subdirectory(hlink) # FIXME: msvc build.
 add_subdirectory(hnetcfg)
 add_subdirectory(httpapi)
 add_subdirectory(iccvid)
@@ -96,8 +94,8 @@
 if(NOT MSVC)
     #FIXME: msvc build.
     add_subdirectory(mshtml)
-    add_subdirectory(msi)
-endif()
+endif()
+add_subdirectory(msi)
 add_subdirectory(mshtml.tlb)
 add_subdirectory(msimg32)
 add_subdirectory(msimtf)

Modified: trunk/reactos/dll/win32/msi/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/CMakeLists.txt?rev=52493&r1=52492&r2=52493&view=diff
==============================================================================
--- trunk/reactos/dll/win32/msi/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msi/CMakeLists.txt [iso-8859-1] Thu Jun 30 16:03:41 2011
@@ -1,3 +1,5 @@
+
+if(NOT MSVC)
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 add_definitions(-D__WINESRC__ -DMSIRUNMODE=MSIRUNMODE_T)
@@ -92,4 +94,7 @@
     ntdll)
 
 add_cd_file(TARGET msi DESTINATION reactos/system32 FOR all)
+
+endif(NOT MSVC)
+
 add_importlib_target(msi.spec)