[CMAKE]

Add base/ modules to bootcd. svn path=/branches/cmake-bringup/; revision=49477
2024-08-19 09:59:44 +00:00 · 2010-11-05 10:37:10 +00:00 · 2010-11-05 10:37:10 +00:00 · b9041e39bf
parent 8456a5473e
commit b9041e39bf
51 changed files with 102 additions and 4 deletions
--- a/base/applications/cacls/CMakeLists.txt
+++ b/base/applications/cacls/CMakeLists.txt
@ -11,3 +11,5 @@ 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)
--- a/base/applications/calc/CMakeLists.txt
+++ b/base/applications/calc/CMakeLists.txt
@ -14,3 +14,5 @@ add_executable(calc

 set_module_type(calc win32gui)
 add_importlibs(calc advapi32 user32 gdi32 msvcrt kernel32)
+
+add_cab_target(calc 1)
--- a/base/applications/charmap/CMakeLists.txt
+++ b/base/applications/charmap/CMakeLists.txt
@ -17,3 +17,5 @@ add_pch(charmap ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
 set_module_type(charmap win32gui)

 add_importlibs(charmap user32 gdi32 comctl32 kernel32 msvcrt)
+
+add_cab_target(charmap 1)
--- a/base/applications/cmdutils/dbgprint/CMakeLists.txt
+++ b/base/applications/cmdutils/dbgprint/CMakeLists.txt
@ -3,3 +3,5 @@ add_executable(dbgprint dbgprint.c)

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

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

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

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

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

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

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

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

 set_module_type(control win32gui)
 add_importlibs(control advapi32 shell32 msvcrt kernel32)
+
+add_cab_target(control 1)
--- a/base/applications/dxdiag/CMakeLists.txt
+++ b/base/applications/dxdiag/CMakeLists.txt
@ -28,3 +28,5 @@ set_module_type(dxdiag win32gui)
 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)
--- a/base/applications/extrac32/CMakeLists.txt
+++ b/base/applications/extrac32/CMakeLists.txt
@ -7,3 +7,5 @@ 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)
--- a/base/applications/fontview/CMakeLists.txt
+++ b/base/applications/fontview/CMakeLists.txt
@ -6,3 +6,5 @@ add_executable(fontview

 set_module_type(fontview win32gui)
 add_importlibs(fontview gdi32 shell32 user32 msvcrt kernel32)
+
+add_cab_target(fontview 1)
--- a/base/applications/games/solitaire/CMakeLists.txt
+++ b/base/applications/games/solitaire/CMakeLists.txt
@ -15,3 +15,5 @@ target_link_libraries(sol cardlib)
 set_module_type(sol win32gui)

 add_importlibs(sol advapi32 comctl32 user32 gdi32 kernel32 msvcrt)
+
+add_cab_target(sol 1)
--- a/base/applications/games/spider/CMakeLists.txt
+++ b/base/applications/games/spider/CMakeLists.txt
@ -15,4 +15,6 @@ target_link_libraries(spider cardlib)

 set_module_type(spider win32gui)

-add_importlibs(spider advapi32 comctl32 user32 gdi32 kernel32 msvcrt)
+add_importlibs(spider advapi32 comctl32 user32 gdi32 kernel32 msvcrt)
+
+add_cab_target(spider 1)
--- a/base/applications/games/winmine/CMakeLists.txt
+++ b/base/applications/games/winmine/CMakeLists.txt
@ -11,3 +11,5 @@ add_executable(winmine
 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)
--- a/base/applications/hh/CMakeLists.txt
+++ b/base/applications/hh/CMakeLists.txt
@ -3,3 +3,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)
--- a/base/applications/iexplore/CMakeLists.txt
+++ b/base/applications/iexplore/CMakeLists.txt
@ -3,3 +3,5 @@ add_executable(iexplore main.c iexplore.rc)

 set_module_type(iexplore win32gui)
 add_importlibs(iexplore shdocvw msvcrt kernel32)
+
+add_cab_target(iexplore 4)
--- a/base/applications/kbswitch/CMakeLists.txt
+++ b/base/applications/kbswitch/CMakeLists.txt
@ -6,4 +6,5 @@ add_executable(kbswitch kbswitch.c kbswitch.rc)
 set_module_type(kbswitch win32gui)
 add_importlibs(kbswitch advapi32 user32 shell32 gdi32 msvcrt kernel32)

+add_cab_target(kbswitch 1)
 add_subdirectory(kbsdll)
--- a/base/applications/logoff/CMakeLists.txt
+++ b/base/applications/logoff/CMakeLists.txt
@ -12,3 +12,5 @@ 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)
--- a/base/applications/magnify/CMakeLists.txt
+++ b/base/applications/magnify/CMakeLists.txt
@ -7,3 +7,5 @@ add_executable(magnify
 set_module_type(magnify win32gui)

 add_importlibs(magnify user32 gdi32 advapi32 shell32 msvcrt kernel32)
+
+add_cab_target(magnify 1)
--- a/base/applications/mplay32/CMakeLists.txt
+++ b/base/applications/mplay32/CMakeLists.txt
@ -6,3 +6,5 @@ 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)
--- a/base/applications/msconfig/CMakeLists.txt
+++ b/base/applications/msconfig/CMakeLists.txt
@ -18,3 +18,5 @@ 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)
--- a/base/applications/mscutils/devmgmt/CMakeLists.txt
+++ b/base/applications/mscutils/devmgmt/CMakeLists.txt
@ -16,3 +16,5 @@ 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)
--- a/base/applications/mscutils/eventvwr/CMakeLists.txt
+++ b/base/applications/mscutils/eventvwr/CMakeLists.txt
@ -6,3 +6,5 @@ add_executable(eventvwr eventvwr.c eventvwr.rc)
 set_module_type(eventvwr win32gui)

 add_importlibs(eventvwr user32 comctl32 advapi32 msvcrt kernel32)
+
+add_cab_target(eventvwr 1)
--- a/base/applications/mscutils/servman/CMakeLists.txt
+++ b/base/applications/mscutils/servman/CMakeLists.txt
@ -30,3 +30,5 @@ add_pch(servman ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
 set_module_type(servman win32gui)

 add_importlibs(servman user32 gdi32 advapi32 version comctl32 shell32 comdlg32 msvcrt kernel32)
+
+add_cab_target(servman 1)
--- a/base/applications/mstsc/CMakeLists.txt
+++ b/base/applications/mstsc/CMakeLists.txt
@ -30,3 +30,5 @@ add_pch(mstsc ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
 set_module_type(mstsc win32gui)

 add_importlibs(mstsc user32 gdi32 comctl32 ws2_32 advapi32 shell32 ole32 comdlg32 msvcrt kernel32)
+
+add_cab_target(mstsc 1)
--- a/base/applications/notepad/CMakeLists.txt
+++ b/base/applications/notepad/CMakeLists.txt
@ -14,3 +14,5 @@ add_executable(notepad ${CMAKE_CURRENT_BINARY_DIR}/notepad_notepad.h.gch ${SOURC
 set_module_type(notepad win32gui)

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

 add_importlibs(paint comdlg32 shell32 user32 gdi32 advapi32 comctl32 msvcrt kernel32)
+
+add_cab_target(paint 1)
--- a/base/applications/rapps/CMakeLists.txt
+++ b/base/applications/rapps/CMakeLists.txt
@ -61,3 +61,4 @@ ENDMACRO (MACRO_ADD_MESSAGE_HEADERS)

 MACRO_ADD_MESSAGE_HEADERS(rappsmsg.mc)

+add_cab_target(rapps 1)
--- a/base/applications/regedit/CMakeLists.txt
+++ b/base/applications/regedit/CMakeLists.txt
@ -30,3 +30,5 @@ target_link_libraries(regedit uuid)
 add_importlibs(regedit user32 gdi32 advapi32 ole32 shell32 comctl32 comdlg32 shlwapi msvcrt kernel32)

 #add_subdirectory(clb)
+
+add_cab_target(regedit 4)
--- a/base/applications/regedt32/CMakeLists.txt
+++ b/base/applications/regedt32/CMakeLists.txt
@ -6,3 +6,5 @@ add_executable(regedt32 regedt32.c resource.rc)
 set_module_type(regedt32 win32gui)

 add_importlibs(regedt32 shell32 shlwapi msvcrt kernel32)
+
+add_cab_target(regedt32 1)
--- a/base/applications/sc/CMakeLists.txt
+++ b/base/applications/sc/CMakeLists.txt
@ -20,3 +20,5 @@ 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)
--- a/base/applications/screensavers/3dtext/CMakeLists.txt
+++ b/base/applications/screensavers/3dtext/CMakeLists.txt
@ -11,4 +11,6 @@ set_module_type(3dtext win32gui)
 set_target_properties(3dtext PROPERTIES SUFFIX ".scr")

 target_link_libraries(3dtext scrnsave)
-add_importlibs(3dtext user32 gdi32 opengl32 glu32 advapi32 msvcrt kernel32)
+add_importlibs(3dtext user32 gdi32 opengl32 glu32 advapi32 msvcrt kernel32)
+
+add_cab_target(3dtext 1)
--- a/base/applications/screensavers/logon/CMakeLists.txt
+++ b/base/applications/screensavers/logon/CMakeLists.txt
@ -9,4 +9,6 @@ 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_importlibs(logon user32 gdi32 msvcrt kernel32)
+
+add_cab_target(logon 1)
--- a/base/applications/sndvol32/CMakeLists.txt
+++ b/base/applications/sndvol32/CMakeLists.txt
@ -15,3 +15,5 @@ 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)
--- a/base/applications/taskmgr/CMakeLists.txt
+++ b/base/applications/taskmgr/CMakeLists.txt
@ -29,3 +29,5 @@ 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)
--- a/base/applications/winver/CMakeLists.txt
+++ b/base/applications/winver/CMakeLists.txt
@ -6,3 +6,5 @@ add_executable(winver winver.c)
 set_module_type(winver win32gui)

 add_importlibs(winver shell32 msvcrt kernel32)
+
+add_cab_target(winver 1)
--- a/base/applications/wordpad/CMakeLists.txt
+++ b/base/applications/wordpad/CMakeLists.txt
@ -19,3 +19,5 @@ 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)
--- a/base/applications/write/CMakeLists.txt
+++ b/base/applications/write/CMakeLists.txt
@ -6,3 +6,5 @@ add_executable(write write.c rsrc.rc)
 set_module_type(write win32gui)

 add_importlibs(write user32 gdi32 msvcrt kernel32)
+
+add_cab_target(write 1)
--- a/base/services/tcpsvcs/CMakeLists.txt
+++ b/base/services/tcpsvcs/CMakeLists.txt
@ -18,3 +18,6 @@ add_pch(tcpsvcs ${CMAKE_CURRENT_SOURCE_DIR}/tcpsvcs.h ${SOURCE})
 set_module_type(tcpsvcs win32cui)
 add_importlibs(tcpsvcs ws2_32 advapi32 msvcrt kernel32 ntdll)

+
+add_cab_target(tcpsvcs 1)
+add_cab(${CMAKE_CURRENT_SOURCE_DIR}/quotes 5)
--- a/base/services/telnetd/CMakeLists.txt
+++ b/base/services/telnetd/CMakeLists.txt
@ -10,3 +10,4 @@ target_link_libraries(telnetd wine)
 set_module_type(telnetd win32cui)
 add_importlibs(telnetd advapi32 ws2_32 msvcrt kernel32 ntdll)

+add_cab_target(telnetd 1)
--- a/base/shell/cmd/CMakeLists.txt
+++ b/base/shell/cmd/CMakeLists.txt
@ -75,4 +75,5 @@ target_link_libraries(cmd wine)

 add_pch(cmd ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h SOURCE)
 set_module_type(cmd win32cui)
-add_importlibs(cmd advapi32 user32 msvcrt kernel32 ntdll)
+add_importlibs(cmd advapi32 user32 msvcrt kernel32 ntdll)
+add_cab_target(cmd 1)
--- a/base/system/bootok/CMakeLists.txt
+++ b/base/system/bootok/CMakeLists.txt
@ -7,3 +7,5 @@ add_executable(bootok bootok.c bootok.rc)
 set_module_type(bootok win32cui)

 add_importlibs(bootok advapi32 msvcrt kernel32 ntdll)
+
+add_cab_target(bootok 1)
--- a/base/system/expand/CMakeLists.txt
+++ b/base/system/expand/CMakeLists.txt
@ -7,3 +7,5 @@ add_executable(expand expand.c expand.rc)
 set_module_type(expand win32cui)

 add_importlibs(expand lz32 setupapi user32 msvcrt kernel32 ntdll)
+
+add_cab_target(expand 1)
--- a/base/system/format/CMakeLists.txt
+++ b/base/system/format/CMakeLists.txt
@ -8,3 +8,5 @@ add_executable(format format.c format.rc)
 set_module_type(format win32cui)

 add_importlibs(format ntdll user32 fmifs msvcrt kernel32 ntdll)
+
+add_cab_target(format 1)
--- a/base/system/msiexec/CMakeLists.txt
+++ b/base/system/msiexec/CMakeLists.txt
@ -14,3 +14,4 @@ target_link_libraries(msiexec uuid wine)

 add_importlibs(msiexec user32 advapi32 ole32 msi msvcrt kernel32 ntdll)

+add_cab_target(msiexec 1)
--- a/base/system/regsvr32/CMakeLists.txt
+++ b/base/system/regsvr32/CMakeLists.txt
@ -9,3 +9,5 @@ add_executable(regsvr32 regsvr32.c regsvr32.rc)
 set_module_type(regsvr32 win32gui)

 add_importlibs(regsvr32 user32 shell32 ole32 msvcrt kernel32 ntdll)
+
+add_cab_target(regsvr32 1)
--- a/base/system/runonce/CMakeLists.txt
+++ b/base/system/runonce/CMakeLists.txt
@ -6,3 +6,5 @@ add_executable(runonce runonce.c runonce.rc)
 set_module_type(runonce win32gui)

 add_importlibs(runonce advapi32 user32 msvcrt kernel32 ntdll)
+
+add_cab_target(runonce 1)