[CMAKE]

- Improve several modules. svn path=/branches/cmake-bringup/; revision=50055
2025-08-07 05:52:57 +00:00 · 2010-12-17 21:54:56 +00:00 · 2010-12-17 21:54:56 +00:00 · f4cc19c36a
commit f4cc19c36a
parent 79c58d8279
259 changed files with 545 additions and 658 deletions
--- a/base/applications/cacls/CMakeLists.txt
+++ b/base/applications/cacls/CMakeLists.txt
@ -11,5 +11,4 @@ add_pch(cacls ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})

 set_module_type(cacls win32cui)
 add_importlibs(cacls advapi32 user32 shell32 msvcrt kernel32)
-
-add_cab_target(cacls 1)
+add_cab_target(cacls 1)
--- a/base/applications/calc/CMakeLists.txt
+++ b/base/applications/calc/CMakeLists.txt
@ -18,4 +18,4 @@ if(MSVC)
 add_importlibs(calc ntdll)
 endif()

-add_cab_target(calc 1)
+add_cab_target(calc 1)
--- a/base/applications/charmap/CMakeLists.txt
+++ b/base/applications/charmap/CMakeLists.txt
@ -18,4 +18,4 @@ set_module_type(charmap win32gui)

 add_importlibs(charmap user32 gdi32 comctl32 kernel32 msvcrt)

-add_cab_target(charmap 1)
+add_cab_target(charmap 1)
--- a/base/applications/cmdutils/dbgprint/CMakeLists.txt
+++ b/base/applications/cmdutils/dbgprint/CMakeLists.txt
@ -1,7 +1,5 @@

 add_executable(dbgprint dbgprint.c)
-
 set_module_type(dbgprint win32cui)
 add_importlibs(dbgprint msvcrt kernel32)
-
-add_cab_target(dbgprint 1)
+add_cab_target(dbgprint 1)
--- a/base/applications/cmdutils/doskey/CMakeLists.txt
+++ b/base/applications/cmdutils/doskey/CMakeLists.txt
@ -5,5 +5,4 @@ add_executable(doskey doskey.c doskey.rc)

 set_module_type(doskey win32cui)
 add_importlibs(doskey user32 msvcrt kernel32)
-
-add_cab_target(doskey 1)
+add_cab_target(doskey 1)
--- a/base/applications/cmdutils/find/CMakeLists.txt
+++ b/base/applications/cmdutils/find/CMakeLists.txt
@ -4,5 +4,4 @@ add_executable(find find.c find.rc)

 set_module_type(find win32cui)
 add_importlibs(find user32 msvcrt kernel32)
-
-add_cab_target(find 1)
+add_cab_target(find 1)
--- a/base/applications/cmdutils/hostname/CMakeLists.txt
+++ b/base/applications/cmdutils/hostname/CMakeLists.txt
@ -4,5 +4,4 @@ add_executable(hostname hostname.c hostname.rc)

 set_module_type(hostname win32cui)
 add_importlibs(hostname msvcrt kernel32)
-
-add_cab_target(hostname 1)
+add_cab_target(hostname 1)
--- a/base/applications/cmdutils/lodctr/CMakeLists.txt
+++ b/base/applications/cmdutils/lodctr/CMakeLists.txt
@ -5,5 +5,4 @@ add_executable(lodctr lodctr_main.c)

 set_module_type(lodctr win32cui)
 add_importlibs(lodctr loadperf msvcrt kernel32)
-
-add_cab_target(lodctr 1)
+add_cab_target(lodctr 1)
--- a/base/applications/cmdutils/more/CMakeLists.txt
+++ b/base/applications/cmdutils/more/CMakeLists.txt
@ -3,5 +3,4 @@ add_executable(more more.c more.rc)

 set_module_type(more win32cui)
 add_importlibs(more user32 msvcrt kernel32)
-
-add_cab_target(more 1)
+add_cab_target(more 1)
--- a/base/applications/cmdutils/reg/CMakeLists.txt
+++ b/base/applications/cmdutils/reg/CMakeLists.txt
@ -8,5 +8,4 @@ add_executable(reg reg.c rsrc.rc)

 set_module_type(reg win32cui)
 add_importlibs(reg advapi32 user32 msvcrt kernel32)
-
-add_cab_target(reg 1)
+add_cab_target(reg 1)
--- a/base/applications/cmdutils/xcopy/CMakeLists.txt
+++ b/base/applications/cmdutils/xcopy/CMakeLists.txt
@ -7,5 +7,4 @@ target_link_libraries(xcopy wine)

 set_module_type(xcopy win32cui)
 add_importlibs(xcopy shell32 user32 msvcrt kernel32 ntdll)
-
-add_cab_target(xcopy 1)
+add_cab_target(xcopy 1)
--- a/base/applications/control/CMakeLists.txt
+++ b/base/applications/control/CMakeLists.txt
@ -5,5 +5,4 @@ add_executable(control control.c control.rc)

 set_module_type(control win32gui)
 add_importlibs(control advapi32 shell32 msvcrt kernel32)
-
-add_cab_target(control 1)
+add_cab_target(control 1)
--- a/base/applications/dxdiag/CMakeLists.txt
+++ b/base/applications/dxdiag/CMakeLists.txt
@ -29,4 +29,4 @@ target_link_libraries(dxdiag dxguid)

 add_importlibs(dxdiag user32 advapi32 comctl32 dinput8 setupapi dsound ddraw version gdi32 winmm d3d9 msvcrt kernel32)

-add_cab_target(dxdiag 1)
+add_cab_target(dxdiag 1)
--- a/base/applications/extrac32/CMakeLists.txt
+++ b/base/applications/extrac32/CMakeLists.txt
@ -7,5 +7,4 @@ target_link_libraries(extrac32 wine)

 set_module_type(extrac32 win32gui)
 add_importlibs(extrac32 shell32 setupapi shlwapi user32 msvcrt kernel32 ntdll)
-
-add_cab_target(extrac32 1)
+add_cab_target(extrac32 1)
--- a/base/applications/fontview/CMakeLists.txt
+++ b/base/applications/fontview/CMakeLists.txt
@ -7,4 +7,4 @@ add_executable(fontview
 set_module_type(fontview win32gui)
 add_importlibs(fontview gdi32 shell32 user32 msvcrt kernel32)

-add_cab_target(fontview 1)
+add_cab_target(fontview 1)
--- a/base/applications/games/solitaire/CMakeLists.txt
+++ b/base/applications/games/solitaire/CMakeLists.txt
@ -16,4 +16,4 @@ set_module_type(sol win32gui)

 add_importlibs(sol advapi32 comctl32 user32 gdi32 kernel32 msvcrt)

-add_cab_target(sol 1)
+add_cab_target(sol 1)
--- a/base/applications/games/spider/CMakeLists.txt
+++ b/base/applications/games/spider/CMakeLists.txt
@ -17,4 +17,4 @@ set_module_type(spider win32gui)

 add_importlibs(spider advapi32 comctl32 user32 gdi32 kernel32 msvcrt)

-add_cab_target(spider 1)
+add_cab_target(spider 1)
--- a/base/applications/games/winmine/CMakeLists.txt
+++ b/base/applications/games/winmine/CMakeLists.txt
@ -12,4 +12,4 @@ set_module_type(winmine win32gui)
 target_link_libraries(winmine wine)
 add_importlibs(winmine user32 gdi32 advapi32 shell32 msvcrt kernel32 ntdll)

-add_cab_target(winmine 1)
+add_cab_target(winmine 1)
--- a/base/applications/hh/CMakeLists.txt
+++ b/base/applications/hh/CMakeLists.txt
@ -1,7 +1,5 @@

 add_executable(hh main.c hh.rc)
-
 set_module_type(hh win32gui)
 add_importlibs(hh gdi32 user32 msvcrt kernel32)
-
-add_cab_target(hh 4)
+add_cab_target(hh 4)
--- a/base/applications/iexplore/CMakeLists.txt
+++ b/base/applications/iexplore/CMakeLists.txt
@ -1,7 +1,5 @@

 add_executable(iexplore main.c iexplore.rc)
-
 set_module_type(iexplore win32gui)
 add_importlibs(iexplore shdocvw msvcrt kernel32)
-
-add_cab_target(iexplore 4)
+add_cab_target(iexplore 4)
--- a/base/applications/kbswitch/kbsdll/CMakeLists.txt
+++ b/base/applications/kbswitch/kbsdll/CMakeLists.txt
@ -1,11 +1,15 @@

 set_unicode()

-add_library(kbsdll SHARED kbsdll.c kbsdll.rc ${CMAKE_CURRENT_BINARY_DIR}/kbsdll.def)
-
 spec2def(kbsdll.dll kbsdll.spec)

+list(APPEND SOURCE
+    kbsdll.c
+    kbsdll.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/kbsdll.def)
+
+add_library(kbsdll SHARED ${SOURCE})
+
 set_module_type(kbsdll win32dll)
 add_importlibs(kbsdll user32 comctl32 kernel32 msvcrt)
-
 add_cab_target(kbsdll 1)
--- a/base/applications/logoff/CMakeLists.txt
+++ b/base/applications/logoff/CMakeLists.txt
@ -1,3 +1,4 @@
+
 add_definitions(-D_DLL -D__USE_CRTIMP)

 list(APPEND SOURCE
@ -10,7 +11,5 @@ add_executable(logoff ${CMAKE_CURRENT_BINARY_DIR}/logoff_precomp.h.gch ${SOURCE}
 add_pch(logoff ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})

 set_module_type(logoff win32cui)
-
 add_importlibs(logoff advapi32 user32 msvcrt kernel32)
-
-add_cab_target(logoff 1)
+add_cab_target(logoff 1)
--- a/base/applications/magnify/CMakeLists.txt
+++ b/base/applications/magnify/CMakeLists.txt
@ -5,7 +5,5 @@ add_executable(magnify
    magnify.rc)

 set_module_type(magnify win32gui)
-
 add_importlibs(magnify user32 gdi32 advapi32 shell32 msvcrt kernel32)
-
-add_cab_target(magnify 1)
+add_cab_target(magnify 1)
--- a/base/applications/mmc/CMakeLists.txt
+++ b/base/applications/mmc/CMakeLists.txt
@ -12,5 +12,4 @@ add_executable(mmcclient ${CMAKE_CURRENT_BINARY_DIR}/mmcclient_precomp.h.gch ${S
 add_pch(mmcclient ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})

 set_module_type(mmcclient win32gui)
-
 add_importlibs(mmcclient user32 gdi32 comdlg32 advapi32 shell32 comctl32 msvcrt kernel32)
--- a/base/applications/mplay32/CMakeLists.txt
+++ b/base/applications/mplay32/CMakeLists.txt
@ -4,7 +4,5 @@ set_unicode()
 add_executable(mplay32 mplay32.c mplay32.rc)

 set_module_type(mplay32 win32gui)
-
 add_importlibs(mplay32 advapi32 comctl32 comdlg32 user32 gdi32 winmm shell32 msvcrt kernel32)
-
-add_cab_target(mplay32 1)
+add_cab_target(mplay32 1)
--- a/base/applications/msconfig/CMakeLists.txt
+++ b/base/applications/msconfig/CMakeLists.txt
@ -16,7 +16,5 @@ add_executable(msconfig ${CMAKE_CURRENT_BINARY_DIR}/msconfig_precomp.h.gch ${SOU
 add_pch(msconfig ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})

 set_module_type(msconfig win32gui)
-
 add_importlibs(msconfig user32 advapi32 version comctl32 shell32 shlwapi msvcrt kernel32)
-
-add_cab_target(msconfig 1)
+add_cab_target(msconfig 1)
--- a/base/applications/mscutils/devmgmt/CMakeLists.txt
+++ b/base/applications/mscutils/devmgmt/CMakeLists.txt
@ -14,7 +14,5 @@ add_executable(devmgmt ${CMAKE_CURRENT_BINARY_DIR}/devmgmt_precomp.h.gch ${SOURC
 add_pch(devmgmt ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})

 set_module_type(devmgmt win32gui)
-
 add_importlibs(devmgmt setupapi gdi32 user32 comctl32 advapi32 devmgr msvcrt kernel32)
-
-add_cab_target(devmgmt 1)
+add_cab_target(devmgmt 1)
--- a/base/applications/mscutils/eventvwr/CMakeLists.txt
+++ b/base/applications/mscutils/eventvwr/CMakeLists.txt
@ -10,4 +10,4 @@ if(MSVC)
 add_importlibs(eventvwr ntdll)
 endif()

-add_cab_target(eventvwr 1)
+add_cab_target(eventvwr 1)
--- a/base/applications/mscutils/servman/CMakeLists.txt
+++ b/base/applications/mscutils/servman/CMakeLists.txt
@ -31,4 +31,4 @@ set_module_type(servman win32gui)

 add_importlibs(servman user32 gdi32 advapi32 version comctl32 shell32 comdlg32 msvcrt kernel32)

-add_cab_target(servman 1)
+add_cab_target(servman 1)
--- a/base/applications/mstsc/CMakeLists.txt
+++ b/base/applications/mstsc/CMakeLists.txt
@ -31,4 +31,4 @@ set_module_type(mstsc win32gui)

 add_importlibs(mstsc user32 gdi32 comctl32 ws2_32 advapi32 shell32 ole32 comdlg32 msvcrt kernel32)

-add_cab_target(mstsc 1)
+add_cab_target(mstsc 1)
--- a/base/applications/network/arp/CMakeLists.txt
+++ b/base/applications/network/arp/CMakeLists.txt
@ -5,4 +5,4 @@ set_module_type(arp win32cui)

 add_importlibs(arp iphlpapi ws2_32 shlwapi msvcrt kernel32)

-add_cab_target(arp 1)
+add_cab_target(arp 1)
--- a/base/applications/network/dwnl/CMakeLists.txt
+++ b/base/applications/network/dwnl/CMakeLists.txt
@ -13,4 +13,4 @@ if(MSVC)
 add_importlibs(dwnl ntdll)
 endif()

-add_cab_target(dwnl 1)
+add_cab_target(dwnl 1)
--- a/base/applications/network/finger/CMakeLists.txt
+++ b/base/applications/network/finger/CMakeLists.txt
@ -1,5 +1,7 @@
-add_definitions(-D__USE_W32_SOCKETS)
-add_definitions(-D_DLL -D__USE_CRTIMP)
+
+add_definitions(
+    -D__USE_W32_SOCKETS
+    -D_DLL -D__USE_CRTIMP)

 add_executable(finger 
    finger.c
@ -9,7 +11,5 @@ add_executable(finger
    finger.rc)

 set_module_type(finger win32cui)
-
 add_importlibs(finger ws2_32 msvcrt kernel32)
-
-add_cab_target(finger 1)
+add_cab_target(finger 1)
--- a/base/applications/network/ftp/CMakeLists.txt
+++ b/base/applications/network/ftp/CMakeLists.txt
@ -1,3 +1,4 @@
+
 add_definitions(-D_DLL -D__USE_CRTIMP)

 add_executable(ftp
@ -18,4 +19,4 @@ target_link_libraries(ftp oldnames)
 add_importlibs(ftp ntdll)
 endif()

-add_cab_target(ftp 1)
+add_cab_target(ftp 1)
--- a/base/applications/network/ipconfig/CMakeLists.txt
+++ b/base/applications/network/ipconfig/CMakeLists.txt
@ -1,8 +1,5 @@

 add_executable(ipconfig ipconfig.c ipconfig.rc)
-
 set_module_type(ipconfig win32cui)
-
 add_importlibs(ipconfig user32 iphlpapi advapi32 msvcrt kernel32)
-
-add_cab_target(ipconfig 1)
+add_cab_target(ipconfig 1)
--- a/base/applications/network/net/CMakeLists.txt
+++ b/base/applications/network/net/CMakeLists.txt
@ -11,7 +11,5 @@ list(APPEND SOURCE
 add_executable(net ${SOURCE})

 set_module_type(net win32cui)
-
 add_importlibs(net ws2_32 msvcrt kernel32)
-
-add_cab_target(net 1)
+add_cab_target(net 1)
--- a/base/applications/network/netstat/CMakeLists.txt
+++ b/base/applications/network/netstat/CMakeLists.txt
@ -1,8 +1,5 @@

 add_executable(netstat netstat.c netstat.rc)
-
 set_module_type(netstat win32cui)
-
 add_importlibs(netstat user32 ws2_32 snmpapi iphlpapi msvcrt kernel32)
-
-add_cab_target(netstat 1)
+add_cab_target(netstat 1)
--- a/base/applications/network/nslookup/CMakeLists.txt
+++ b/base/applications/network/nslookup/CMakeLists.txt
@ -5,7 +5,5 @@ add_executable(nslookup
    nslookup.rc)

 set_module_type(nslookup win32cui)
-
 add_importlibs(nslookup user32 ws2_32 snmpapi iphlpapi msvcrt kernel32)
-
-add_cab_target(nslookup 1)
+add_cab_target(nslookup 1)
--- a/base/applications/network/ping/CMakeLists.txt
+++ b/base/applications/network/ping/CMakeLists.txt
@ -1,3 +1,4 @@
+
 add_definitions(-D__USE_W32_SOCKETS)

 add_executable(ping ping.c ping.rc)
@ -9,4 +10,4 @@ if(MSVC)
 add_importlibs(ping ntdll)
 endif()

-add_cab_target(ping 1)
+add_cab_target(ping 1)
--- a/base/applications/network/route/CMakeLists.txt
+++ b/base/applications/network/route/CMakeLists.txt
@ -1,3 +1,4 @@
+
 add_definitions(-D_DLL -D__USE_CRTIMP)

 set_unicode()
@ -6,5 +7,4 @@ add_executable(route route.c route.rc)

 set_module_type(route win32cui)
 add_importlibs(route ws2_32 iphlpapi msvcrt kernel32)
-
-add_cab_target(route 1)
+add_cab_target(route 1)
--- a/base/applications/network/telnet/CMakeLists.txt
+++ b/base/applications/network/telnet/CMakeLists.txt
@ -1,3 +1,4 @@
+
 add_definitions(
    -D_CRT_NONSTDC_NO_DEPRECATE
    -D_DLL -D__USE_CRTIMP)
@ -27,7 +28,5 @@ add_executable(telnet
    telnet.rc)

 set_module_type(telnet win32cui)
-
 add_importlibs(telnet ws2_32 user32 kernel32 msvcrt)
-
-add_cab_target(telnet 1)
+add_cab_target(telnet 1)
--- a/base/applications/network/tracert/CMakeLists.txt
+++ b/base/applications/network/tracert/CMakeLists.txt
@ -1,3 +1,4 @@
+
 add_definitions(-D__USE_W32_SOCKETS)

 add_executable(tracert tracert.c tracert.rc)
@ -9,4 +10,4 @@ if(MSVC)
 add_importlibs(tracert ntdll)
 endif()

-add_cab_target(tracert 1)
+add_cab_target(tracert 1)
--- a/base/applications/network/whois/CMakeLists.txt
+++ b/base/applications/network/whois/CMakeLists.txt
@ -1,9 +1,8 @@
+
 add_definitions(-D_DLL -D__USE_CRTIMP)

 add_executable(whois whois.c whois.rc)

 set_module_type(whois win32cui)
-
 add_importlibs(whois ws2_32 msvcrt kernel32)
-
-add_cab_target(whois 1)
+add_cab_target(whois 1)
--- a/base/applications/notepad/CMakeLists.txt
+++ b/base/applications/notepad/CMakeLists.txt
@ -1,18 +1,17 @@
+
 list(APPEND SOURCE
    dialog.c
    main.c
    settings.c
    text.c
    rsrc.rc)
-    
-    
+
 set_rc_compiler()

 add_pch(notepad ${CMAKE_CURRENT_SOURCE_DIR}/notepad.h ${SOURCE})
+
 add_executable(notepad ${CMAKE_CURRENT_BINARY_DIR}/notepad_notepad.h.gch ${SOURCE})

 set_module_type(notepad win32gui)
-
 add_importlibs(notepad user32 gdi32 comctl32 comdlg32 advapi32 shell32 msvcrt kernel32)
-
-add_cab_target(notepad 1)
+add_cab_target(notepad 1)
--- a/base/applications/paint/CMakeLists.txt
+++ b/base/applications/paint/CMakeLists.txt
@ -17,7 +17,5 @@ add_executable(paint
    rsrc.rc)

 set_module_type(paint win32gui)
-
 add_importlibs(paint comdlg32 shell32 user32 gdi32 advapi32 comctl32 msvcrt kernel32)
-
-add_cab_target(paint 1)
+add_cab_target(paint 1)
--- a/base/applications/regedit/CMakeLists.txt
+++ b/base/applications/regedit/CMakeLists.txt
@ -1,3 +1,4 @@
+
 add_definitions(-D_DLL -D__USE_CRTIMP)

 set_unicode()
--- a/base/applications/regedit/clb/CMakeLists.txt
+++ b/base/applications/regedit/clb/CMakeLists.txt
@ -10,7 +10,5 @@ add_library(clb SHARED
    ${CMAKE_CURRENT_BINARY_DIR}/clb.def)

 set_module_type(clb win32dll)
-
-
 add_importlibs(clb user32 gdi32 comctl32 kernel32 ntdll)
    
--- a/base/applications/regedt32/CMakeLists.txt
+++ b/base/applications/regedt32/CMakeLists.txt
@ -4,7 +4,5 @@ set_unicode()
 add_executable(regedt32 regedt32.c resource.rc)

 set_module_type(regedt32 win32gui)
-
 add_importlibs(regedt32 shell32 shlwapi msvcrt kernel32)
-
-add_cab_target(regedt32 1)
+add_cab_target(regedt32 1)
--- a/base/applications/sc/CMakeLists.txt
+++ b/base/applications/sc/CMakeLists.txt
@ -18,7 +18,5 @@ add_executable(sc ${CMAKE_CURRENT_BINARY_DIR}/sc_sc.h.gch ${SOURCE})
 add_pch(sc ${CMAKE_CURRENT_SOURCE_DIR}/sc.h ${SOURCE})

 set_module_type(sc win32cui)
-
 add_importlibs(sc advapi32 msvcrt kernel32)
-
-add_cab_target(sc 1)
+add_cab_target(sc 1)
--- a/base/applications/screensavers/3dtext/CMakeLists.txt
+++ b/base/applications/screensavers/3dtext/CMakeLists.txt
@ -13,4 +13,4 @@ set_target_properties(3dtext PROPERTIES SUFFIX ".scr")
 target_link_libraries(3dtext scrnsave)
 add_importlibs(3dtext user32 gdi32 opengl32 glu32 advapi32 msvcrt kernel32)

-add_cab_target(3dtext 1)
+add_cab_target(3dtext 1)
--- a/base/applications/screensavers/CMakeLists.txt
+++ b/base/applications/screensavers/CMakeLists.txt
@ -1,2 +1,3 @@
+
 add_subdirectory(3dtext)
-add_subdirectory(logon)
+add_subdirectory(logon)
--- a/base/applications/screensavers/logon/CMakeLists.txt
+++ b/base/applications/screensavers/logon/CMakeLists.txt
@ -1,14 +1,12 @@
+
 set_rc_compiler()
 set_unicode()

-add_executable(logon
-    logon.c
-    logon.rc)
+add_executable(logon logon.c logon.rc)

 set_module_type(logon win32gui)
 set_target_properties(logon PROPERTIES SUFFIX ".scr")

 target_link_libraries(logon scrnsave)
 add_importlibs(logon user32 gdi32 msvcrt kernel32)
-
-add_cab_target(logon 1)
+add_cab_target(logon 1)
--- a/base/applications/shutdown/CMakeLists.txt
+++ b/base/applications/shutdown/CMakeLists.txt
@ -1,3 +1,4 @@
+
 add_definitions(-D_DLL -D__USE_CRTIMP)

 list(APPEND SOURCE
@ -10,6 +11,5 @@ add_executable(shutdown ${CMAKE_CURRENT_BINARY_DIR}/shutdown_precomp.h.gch ${SOU
 add_pch(shutdown ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})

 set_module_type(shutdown win32cui)
-
 add_importlibs(shutdown advapi32 user32 msvcrt kernel32)
-add_cab_target(shutdown 1)
+add_cab_target(shutdown 1)
--- a/base/applications/sndrec32/CMakeLists.txt
+++ b/base/applications/sndrec32/CMakeLists.txt
@ -11,7 +11,5 @@ add_executable(sndrec32
    rsrc.rc)

 target_link_libraries(sndrec32 stlport)
-
 set_module_type(sndrec32 win32gui)
-
 add_importlibs(sndrec32 winmm user32 msacm32 comctl32 comdlg32 gdi32 msvcrt)
--- a/base/applications/sndvol32/CMakeLists.txt
+++ b/base/applications/sndvol32/CMakeLists.txt
@ -1,3 +1,4 @@
+
 add_definitions(-D_DLL -D__USE_CRTIMP)

 set_unicode()
@ -13,7 +14,5 @@ add_executable(sndvol32 ${CMAKE_CURRENT_BINARY_DIR}/sndvol32_sndvol32.h.gch ${SO
 add_pch(sndvol32 ${CMAKE_CURRENT_SOURCE_DIR}/sndvol32.h ${SOURCE})

 set_module_type(sndvol32 win32gui)
-
 add_importlibs(sndvol32 user32 advapi32 gdi32 comctl32 shell32 winmm msvcrt kernel32 ntdll)
-
-add_cab_target(sndvol32 1)
+add_cab_target(sndvol32 1)
--- a/base/applications/taskmgr/CMakeLists.txt
+++ b/base/applications/taskmgr/CMakeLists.txt
@ -27,7 +27,5 @@ add_executable(taskmgr ${CMAKE_CURRENT_BINARY_DIR}/taskmgr_precomp.h.gch ${SOURC
 add_pch(taskmgr ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})

 set_module_type(taskmgr win32gui)
-
 add_importlibs(taskmgr advapi32 user32 gdi32 shell32 comctl32 msvcrt kernel32 ntdll)
-
-add_cab_target(taskmgr 1)
+add_cab_target(taskmgr 1)
--- a/base/applications/winhlp32/CMakeLists.txt
+++ b/base/applications/winhlp32/CMakeLists.txt
@ -21,4 +21,4 @@ set_module_type(winhlp32 win32gui)

 target_link_libraries(winhlp32 wine)
 add_importlibs(winhlp32 user32 gdi32 shell32 comctl32 comdlg32 msvcrt kernel32 ntdll)
-add_cab_target(winhlp32 4)
+add_cab_target(winhlp32 4)
--- a/base/applications/winver/CMakeLists.txt
+++ b/base/applications/winver/CMakeLists.txt
@ -2,9 +2,6 @@
 set_unicode()

 add_executable(winver winver.c)
-
 set_module_type(winver win32gui)
-
 add_importlibs(winver shell32 msvcrt kernel32)
-
-add_cab_target(winver 1)
+add_cab_target(winver 1)
--- a/base/applications/wordpad/CMakeLists.txt
+++ b/base/applications/wordpad/CMakeLists.txt
@ -1,3 +1,12 @@
+
+include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine)
+
+add_definitions(
+    -D__ROS_LONG64__
+    -D_DLL -D__USE_CRTIMP)
+
+set_rc_compiler()
+
 list(APPEND SOURCE
    olecallback.c
    print.c
@ -5,19 +14,10 @@ list(APPEND SOURCE
    wordpad.c
    rsrc.rc)

-add_definitions(
-    -D__ROS_LONG64__
-    -D_DLL -D__USE_CRTIMP)
-
-include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine)
-
-set_rc_compiler()
-
 add_executable(wordpad ${SOURCE})
+
 set_module_type(wordpad win32gui)

 target_link_libraries(wordpad wine uuid)
-
 add_importlibs(wordpad comdlg32 ole32 shell32 user32 gdi32 advapi32 comctl32 msvcrt kernel32 ntdll)
-
-add_cab_target(wordpad 1)
+add_cab_target(wordpad 1)
--- a/base/applications/write/CMakeLists.txt
+++ b/base/applications/write/CMakeLists.txt
@ -2,9 +2,6 @@
 set_unicode()

 add_executable(write write.c rsrc.rc)
-
 set_module_type(write win32gui)
-
 add_importlibs(write user32 gdi32 msvcrt kernel32)
-
-add_cab_target(write 1)
+add_cab_target(write 1)