diff --git a/CMakeLists.txt b/CMakeLists.txt index 0746eda4b1e..b62f464fe20 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 2.6) -if(${CMAKE_VERSION} VERSION_GREATER "2.8.3") +if(POLICY CMP0017) # Shadow cmake provided modules cmake_policy(SET CMP0017 OLD) endif() @@ -13,6 +13,7 @@ include(include/reactos/version.cmake) # Don't escape preprocessor definition values added via add_definitions cmake_policy(SET CMP0005 OLD) +cmake_policy(SET CMP0002 NEW) set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE ON) @@ -71,6 +72,9 @@ else() set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY NEVER) set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE NEVER) + + #useful stuff! + include(CMakeParseArguments) # Do some cleanup file(REMOVE @@ -185,8 +189,9 @@ else() include(baseaddress.cmake) - add_subdirectory(base) + #begin with boot so reactos_cab target is defined before all other modules add_subdirectory(boot) + add_subdirectory(base) add_subdirectory(dll) add_subdirectory(drivers) add_subdirectory(hal) @@ -200,9 +205,6 @@ else() file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/importlibs) - #bootcd and livecd - include(ros_cd.cmake) - add_dependency_footer() endif() diff --git a/CMakeMacros.cmake b/CMakeMacros.cmake index 1e7510893c4..3d4e3a2bc21 100644 --- a/CMakeMacros.cmake +++ b/CMakeMacros.cmake @@ -22,7 +22,6 @@ macro(CreateBootSectorTarget _target_name _asm_file _object_file) DEPENDS ${_asm_file}) set_source_files_properties(${_object_file} PROPERTIES GENERATED TRUE) add_custom_target(${_target_name} ALL DEPENDS ${_object_file}) - add_minicd(${_object_file} loader ${OBJECT_NAME}) endmacro() else() @@ -32,21 +31,6 @@ endmacro() endif() -macro(add_minicd_target _targetname _dir) # optional parameter: _nameoncd - if("${ARGN}" STREQUAL "") - get_target_property(FILENAME ${_targetname} LOCATION) - get_filename_component(_nameoncd ${FILENAME} NAME) - else() - set(_nameoncd ${ARGN}) - endif() - - file(APPEND ${REACTOS_BINARY_DIR}/boot/ros_minicd_target.txt "${_targetname}\t${_dir}\t${_nameoncd}\n") -endmacro() - -macro(add_minicd FILENAME _dir _nameoncd) - file(APPEND ${REACTOS_BINARY_DIR}/boot/ros_minicd.txt "${FILENAME}\t${_dir}\t${_nameoncd}\n") -endmacro() - macro(set_cpp) include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/c++/stlport) set(IS_CPP 1) @@ -55,68 +39,6 @@ macro(set_cpp) -DNATIVE_C_INCLUDE=${REACTOS_SOURCE_DIR}/include/crt) endmacro() -macro(add_livecd_target _targetname _dir )# optional parameter : _nameoncd - if("${ARGN}" STREQUAL "") - get_target_property(FILENAME ${_targetname} LOCATION) - get_filename_component(_nameoncd ${FILENAME} NAME) - else() - set(_nameoncd ${ARGN}) - endif() - - file(APPEND ${REACTOS_BINARY_DIR}/boot/ros_livecd_target.txt "${_targetname}\t${_dir}\t${_nameoncd}\n") -endmacro() - -macro(add_livecd FILENAME _dir)# optional parameter : _nameoncd - if("${ARGN}" STREQUAL "") - get_filename_component(_nameoncd ${FILENAME} NAME) - else() - set(_nameoncd ${ARGN}) - endif() - file(APPEND ${REACTOS_BINARY_DIR}/boot/ros_livecd.txt "${FILENAME}\t${_dir}\t${_nameoncd}\n") -endmacro() - -macro(cab_to_dir _dir_num _var_name) -# 1 = system32 -# 2 = system32\drivers -# 3 = Fonts -# 4 = -# 5 = system32\drivers\etc -# 6 = inf -# 7 = bin -# 8 = media - if(${_dir_num} STREQUAL "1") - set(${_var_name} "reactos/system32") - elseif(${_dir_num} STREQUAL "2") - set(${_var_name} "reactos/system32/drivers") - elseif(${_dir_num} STREQUAL "3") - set(${_var_name} "reactos/fonts") - elseif(${_dir_num} STREQUAL "4") - set(${_var_name} "reactos") - elseif(${_dir_num} STREQUAL "5") - set(${_var_name} "reactos/system32/drivers/etc") - elseif(${_dir_num} STREQUAL "6") - set(${_var_name} "reactos/inf") - elseif(${_dir_num} STREQUAL "7") - set(${_var_name} "reactos/bin") - elseif(${_dir_num} STREQUAL "8") - set(${_var_name} "reactos/system32/drivers") - else() - message(FATAL_ERROR "Wrong directory ${_dir_num}") - endif() -endmacro() - -macro(add_cab_target _targetname _num ) - file(APPEND ${REACTOS_BINARY_DIR}/boot/ros_cab_target.txt "${_targetname}\t${_num}\n") - cab_to_dir(${_num} _dir) - add_livecd_target(${_targetname} ${_dir}) -endmacro() - -macro(add_cab FILENAME _num) - file(APPEND ${REACTOS_BINARY_DIR}/boot/ros_cab.txt "${FILENAME}\t${_num}\n") - cab_to_dir(${_num} _dir) - add_livecd(${FILENAME} ${_dir}) -endmacro() - macro(add_dependency_node _node) if(GENERATE_DEPENDENCY_GRAPH) get_target_property(_type ${_node} TYPE) @@ -159,3 +81,75 @@ macro(add_message_headers) endforeach() endmacro() +macro(dir_to_num dir var) + if(${dir} STREQUAL reactos/system32) + set(${var} 1) + elseif(${dir} STREQUAL reactos/system32/drivers) + set(${var} 2) + elseif(${dir} STREQUAL reactos/Fonts) + set(${var} 3) + elseif(${dir} STREQUAL reactos) + set(${var} 4) + elseif(${dir} STREQUAL reactos/system32/drivers/etc) + set(${var} 5) + elseif(${dir} STREQUAL reactos/inf) + set(${var} 6) + elseif(${dir} STREQUAL reactos/bin) + set(${var} 7) + elseif(${dir} STREQUAL reactos/media) + set(${var} 8) + else() + message(ERROR "Wrong destination: ${dir}") + endif() +endmacro() + +function(add_cd_file) + cmake_parse_arguments(_CD "NO_CAB;NO_LIVECD" "DESTINATION;NAME_ON_CD;TARGET" "FILE" ${ARGN}) + if(NOT (_CD_TARGET OR _CD_FILE)) + message(FATAL_ERROR "You must provide a target or a file to install!") + endif() + + if(NOT _CD_DESTINATION) + message(FATAL_ERROR "You must provide a destination") + elseif(${_CD_DESTINATION} STREQUAL root) + set(_CD_DESTINATION "") + endif() + + if(NOT _CD_FILE) + get_target_property(__file ${_CD_TARGET} LOCATION) + else() + if(NOT _CD_NO_CAB) + add_dependencies(reactos_cab ${_CD_FILE}) + endif() + set(__file ${_CD_FILE}) + endif() + #whether or not we should put it in reactos.cab or directly on cd + if(_CD_NO_CAB) + foreach(item ${__file}) + file(APPEND ${REACTOS_BINARY_DIR}/boot/bootcd.cmake "file(COPY \"${item}\" DESTINATION \"\${CD_DIR}/${_CD_DESTINATION}\")\n") + endforeach() + if(_CD_NAME_ON_CD) + get_filename_component(__file ${__file} NAME) + #rename it in the cd tree + file(APPEND ${REACTOS_BINARY_DIR}/boot/bootcd.cmake "file(RENAME \${CD_DIR}/${_CD_DESTINATION}/${__file} \${CD_DIR}/${_CD_DESTINATION}/${_CD_NAME_ON_CD})\n") + endif() + #add right dependency + if(_CD_TARGET) + add_dependencies(bootcd ${_CD_TARGET}) + else() + add_dependencies(bootcd ${_CD_FILE}) + endif() + if(NOT _CD_NO_LIVECD) + file(APPEND ${REACTOS_BINARY_DIR}/boot/livecd.cmake "file(COPY \"${__file}\" DESTINATION \"\${CD_DIR}/${_CD_DESTINATION}\")\n") + endif() + else() + #add right dependency + if(_CD_TARGET) + add_dependencies(reactos_cab ${_CD_TARGET}) + else() + add_dependencies(reactos_cab ${_CD_FILE}) + endif() + dir_to_num(${_CD_DESTINATION} _num) + file(APPEND ${REACTOS_BINARY_DIR}/boot/bootdata/packages/reactos.dff.dyn "${__file} ${_num}\n") + endif() +endfunction() diff --git a/base/applications/cacls/CMakeLists.txt b/base/applications/cacls/CMakeLists.txt index 6ec1bc55b84..b3ecc66bf7f 100644 --- a/base/applications/cacls/CMakeLists.txt +++ b/base/applications/cacls/CMakeLists.txt @@ -12,4 +12,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_cd_file(TARGET cacls DESTINATION reactos/system32) diff --git a/base/applications/calc/CMakeLists.txt b/base/applications/calc/CMakeLists.txt index cfa99b5b52e..aabe3702aaf 100644 --- a/base/applications/calc/CMakeLists.txt +++ b/base/applications/calc/CMakeLists.txt @@ -19,4 +19,4 @@ if(MSVC) add_importlibs(calc ntdll) endif() -add_cab_target(calc 1) +add_cd_file(TARGET calc DESTINATION reactos/system32) diff --git a/base/applications/charmap/CMakeLists.txt b/base/applications/charmap/CMakeLists.txt index e2b52019263..6f0cb6bf11c 100644 --- a/base/applications/charmap/CMakeLists.txt +++ b/base/applications/charmap/CMakeLists.txt @@ -19,4 +19,4 @@ set_module_type(charmap win32gui) add_importlibs(charmap user32 gdi32 comctl32 kernel32 msvcrt) -add_cab_target(charmap 1) +add_cd_file(TARGET charmap DESTINATION reactos/system32) diff --git a/base/applications/cmdutils/dbgprint/CMakeLists.txt b/base/applications/cmdutils/dbgprint/CMakeLists.txt index 5a3ce00f410..d8d26833443 100644 --- a/base/applications/cmdutils/dbgprint/CMakeLists.txt +++ b/base/applications/cmdutils/dbgprint/CMakeLists.txt @@ -2,4 +2,4 @@ add_executable(dbgprint dbgprint.c) set_module_type(dbgprint win32cui) add_importlibs(dbgprint msvcrt kernel32) -add_cab_target(dbgprint 1) +add_cd_file(TARGET dbgprint DESTINATION reactos/system32) diff --git a/base/applications/cmdutils/doskey/CMakeLists.txt b/base/applications/cmdutils/doskey/CMakeLists.txt index 62f86c5a478..19ab4db68bf 100644 --- a/base/applications/cmdutils/doskey/CMakeLists.txt +++ b/base/applications/cmdutils/doskey/CMakeLists.txt @@ -6,4 +6,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_cd_file(TARGET doskey DESTINATION reactos/system32) diff --git a/base/applications/cmdutils/find/CMakeLists.txt b/base/applications/cmdutils/find/CMakeLists.txt index 30acb795067..51487aad3e3 100644 --- a/base/applications/cmdutils/find/CMakeLists.txt +++ b/base/applications/cmdutils/find/CMakeLists.txt @@ -4,4 +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_cd_file(TARGET find DESTINATION reactos/system32) diff --git a/base/applications/cmdutils/hostname/CMakeLists.txt b/base/applications/cmdutils/hostname/CMakeLists.txt index 5c715b72657..ca18d41a412 100644 --- a/base/applications/cmdutils/hostname/CMakeLists.txt +++ b/base/applications/cmdutils/hostname/CMakeLists.txt @@ -4,4 +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_cd_file(TARGET hostname DESTINATION reactos/system32) diff --git a/base/applications/cmdutils/lodctr/CMakeLists.txt b/base/applications/cmdutils/lodctr/CMakeLists.txt index 2495c35b8e5..4e67ae7133f 100644 --- a/base/applications/cmdutils/lodctr/CMakeLists.txt +++ b/base/applications/cmdutils/lodctr/CMakeLists.txt @@ -5,4 +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_cd_file(TARGET lodctr DESTINATION reactos/system32) diff --git a/base/applications/cmdutils/more/CMakeLists.txt b/base/applications/cmdutils/more/CMakeLists.txt index 2b8deb1a7f2..a679de907e5 100644 --- a/base/applications/cmdutils/more/CMakeLists.txt +++ b/base/applications/cmdutils/more/CMakeLists.txt @@ -3,4 +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_cd_file(TARGET more DESTINATION reactos/system32) diff --git a/base/applications/cmdutils/reg/CMakeLists.txt b/base/applications/cmdutils/reg/CMakeLists.txt index 4e7fddbaac0..0b47b31929f 100644 --- a/base/applications/cmdutils/reg/CMakeLists.txt +++ b/base/applications/cmdutils/reg/CMakeLists.txt @@ -8,4 +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_cd_file(TARGET reg DESTINATION reactos/system32) diff --git a/base/applications/cmdutils/xcopy/CMakeLists.txt b/base/applications/cmdutils/xcopy/CMakeLists.txt index 7624c0c2ac5..2de722b20ec 100644 --- a/base/applications/cmdutils/xcopy/CMakeLists.txt +++ b/base/applications/cmdutils/xcopy/CMakeLists.txt @@ -7,4 +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_cd_file(TARGET xcopy DESTINATION reactos/system32) diff --git a/base/applications/control/CMakeLists.txt b/base/applications/control/CMakeLists.txt index bb6d2e0d4be..c5c15099235 100644 --- a/base/applications/control/CMakeLists.txt +++ b/base/applications/control/CMakeLists.txt @@ -6,4 +6,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_cd_file(TARGET control DESTINATION reactos/system32) diff --git a/base/applications/dxdiag/CMakeLists.txt b/base/applications/dxdiag/CMakeLists.txt index e5fcc0f841b..84128a5c3ee 100644 --- a/base/applications/dxdiag/CMakeLists.txt +++ b/base/applications/dxdiag/CMakeLists.txt @@ -30,4 +30,4 @@ target_link_libraries(dxdiag dxguid) add_importlibs(dxdiag user32 advapi32 comctl32 dinput8 setupapi dsound ddraw version gdi32 winmm d3d9 msvcrt kernel32 ntdll) -add_cab_target(dxdiag 1) +add_cd_file(TARGET dxdiag DESTINATION reactos/system32) diff --git a/base/applications/extrac32/CMakeLists.txt b/base/applications/extrac32/CMakeLists.txt index 1770afa59f0..dde47add09a 100644 --- a/base/applications/extrac32/CMakeLists.txt +++ b/base/applications/extrac32/CMakeLists.txt @@ -7,4 +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_cd_file(TARGET extrac32 DESTINATION reactos/system32) diff --git a/base/applications/findstr/CMakeLists.txt b/base/applications/findstr/CMakeLists.txt index af3cdbfbc49..6f7ebf89c8c 100644 --- a/base/applications/findstr/CMakeLists.txt +++ b/base/applications/findstr/CMakeLists.txt @@ -7,4 +7,4 @@ add_executable(findstr set_module_type(findstr win32cui) add_importlibs(findstr user32 msvcrt kernel32) -add_cab_target(findstr 1) +add_cd_file(TARGET findstr DESTINATION reactos/system32) diff --git a/base/applications/fontview/CMakeLists.txt b/base/applications/fontview/CMakeLists.txt index 8be0dea160e..13af048a8c9 100644 --- a/base/applications/fontview/CMakeLists.txt +++ b/base/applications/fontview/CMakeLists.txt @@ -8,4 +8,4 @@ add_executable(fontview set_module_type(fontview win32gui) add_importlibs(fontview gdi32 shell32 user32 msvcrt kernel32) -add_cab_target(fontview 1) +add_cd_file(TARGET fontview DESTINATION reactos/system32) diff --git a/base/applications/games/solitaire/CMakeLists.txt b/base/applications/games/solitaire/CMakeLists.txt index 938a32eebc5..ce4aba2090d 100644 --- a/base/applications/games/solitaire/CMakeLists.txt +++ b/base/applications/games/solitaire/CMakeLists.txt @@ -17,4 +17,4 @@ set_module_type(sol win32gui) add_importlibs(sol advapi32 comctl32 user32 gdi32 kernel32 msvcrt) -add_cab_target(sol 1) +add_cd_file(TARGET sol DESTINATION reactos/system32) diff --git a/base/applications/games/spider/CMakeLists.txt b/base/applications/games/spider/CMakeLists.txt index acbd76f282b..45dd3d3ee06 100644 --- 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_cd_file(TARGET spider DESTINATION reactos/system32) diff --git a/base/applications/games/winmine/CMakeLists.txt b/base/applications/games/winmine/CMakeLists.txt index 63d7e6eaee9..2a3382053af 100644 --- 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_cd_file(TARGET winmine DESTINATION reactos/system32) diff --git a/base/applications/hh/CMakeLists.txt b/base/applications/hh/CMakeLists.txt index 3b78ce5a911..ea5dd2114c7 100644 --- a/base/applications/hh/CMakeLists.txt +++ b/base/applications/hh/CMakeLists.txt @@ -3,4 +3,4 @@ set_rc_compiler() 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_cd_file(TARGET hh DESTINATION reactos) diff --git a/base/applications/iexplore/CMakeLists.txt b/base/applications/iexplore/CMakeLists.txt index fd2c6f162e0..3d7445c6217 100644 --- a/base/applications/iexplore/CMakeLists.txt +++ b/base/applications/iexplore/CMakeLists.txt @@ -3,4 +3,4 @@ set_rc_compiler() add_executable(iexplore main.c iexplore.rc) set_module_type(iexplore win32gui) add_importlibs(iexplore shdocvw msvcrt kernel32) -add_cab_target(iexplore 4) +add_cd_file(TARGET iexplore DESTINATION reactos) diff --git a/base/applications/kbswitch/CMakeLists.txt b/base/applications/kbswitch/CMakeLists.txt index f48cd9cfbfa..bcd39131800 100644 --- a/base/applications/kbswitch/CMakeLists.txt +++ b/base/applications/kbswitch/CMakeLists.txt @@ -7,5 +7,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_cd_file(TARGET kbswitch DESTINATION reactos/system32) add_subdirectory(kbsdll) diff --git a/base/applications/kbswitch/kbsdll/CMakeLists.txt b/base/applications/kbswitch/kbsdll/CMakeLists.txt index 135969e6929..785e6290342 100644 --- a/base/applications/kbswitch/kbsdll/CMakeLists.txt +++ b/base/applications/kbswitch/kbsdll/CMakeLists.txt @@ -12,4 +12,4 @@ add_library(kbsdll SHARED ${SOURCE}) set_module_type(kbsdll win32dll) add_importlibs(kbsdll user32 comctl32 kernel32 msvcrt) -add_cab_target(kbsdll 1) +add_cd_file(TARGET kbsdll DESTINATION reactos/system32) diff --git a/base/applications/logoff/CMakeLists.txt b/base/applications/logoff/CMakeLists.txt index c7cbb7f70ea..30981a94819 100644 --- a/base/applications/logoff/CMakeLists.txt +++ b/base/applications/logoff/CMakeLists.txt @@ -12,4 +12,4 @@ 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_cd_file(TARGET logoff DESTINATION reactos/system32) diff --git a/base/applications/magnify/CMakeLists.txt b/base/applications/magnify/CMakeLists.txt index b4641891244..8a6cc243176 100644 --- a/base/applications/magnify/CMakeLists.txt +++ b/base/applications/magnify/CMakeLists.txt @@ -8,4 +8,4 @@ add_executable(magnify set_module_type(magnify win32gui) add_importlibs(magnify user32 gdi32 advapi32 shell32 msvcrt kernel32) -add_cab_target(magnify 1) +add_cd_file(TARGET magnify DESTINATION reactos/system32) diff --git a/base/applications/mplay32/CMakeLists.txt b/base/applications/mplay32/CMakeLists.txt index 549df475a5e..dc6ff3d48ff 100644 --- a/base/applications/mplay32/CMakeLists.txt +++ b/base/applications/mplay32/CMakeLists.txt @@ -6,4 +6,4 @@ 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_cd_file(TARGET mplay32 DESTINATION reactos/system32) diff --git a/base/applications/msconfig/CMakeLists.txt b/base/applications/msconfig/CMakeLists.txt index 56134895e06..43f3dceaa00 100644 --- a/base/applications/msconfig/CMakeLists.txt +++ b/base/applications/msconfig/CMakeLists.txt @@ -18,4 +18,4 @@ 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_cd_file(TARGET msconfig DESTINATION reactos/system32) diff --git a/base/applications/mscutils/devmgmt/CMakeLists.txt b/base/applications/mscutils/devmgmt/CMakeLists.txt index 26d97b28387..ab96a038889 100644 --- a/base/applications/mscutils/devmgmt/CMakeLists.txt +++ b/base/applications/mscutils/devmgmt/CMakeLists.txt @@ -15,4 +15,4 @@ 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_cd_file(TARGET devmgmt DESTINATION reactos/system32) diff --git a/base/applications/mscutils/eventvwr/CMakeLists.txt b/base/applications/mscutils/eventvwr/CMakeLists.txt index 0e138af7910..8d02579ce78 100644 --- 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_cd_file(TARGET eventvwr DESTINATION reactos/system32) diff --git a/base/applications/mscutils/servman/CMakeLists.txt b/base/applications/mscutils/servman/CMakeLists.txt index 3cf667b7290..af36e518c26 100644 --- a/base/applications/mscutils/servman/CMakeLists.txt +++ b/base/applications/mscutils/servman/CMakeLists.txt @@ -32,4 +32,4 @@ set_module_type(servman win32gui) add_importlibs(servman user32 gdi32 advapi32 version comctl32 shell32 comdlg32 msvcrt kernel32) -add_cab_target(servman 1) +add_cd_file(TARGET servman DESTINATION reactos/system32) diff --git a/base/applications/mspaint/CMakeLists.txt b/base/applications/mspaint/CMakeLists.txt index c1bfeb5729c..69e76837c25 100644 --- a/base/applications/mspaint/CMakeLists.txt +++ b/base/applications/mspaint/CMakeLists.txt @@ -18,4 +18,4 @@ add_executable(mspaint set_module_type(mspaint win32gui) add_importlibs(mspaint comdlg32 shell32 user32 gdi32 advapi32 comctl32 msvcrt kernel32) -add_cab_target(mspaint 1) +add_cd_file(TARGET mspaint DESTINATION reactos/system32) diff --git a/base/applications/mstsc/CMakeLists.txt b/base/applications/mstsc/CMakeLists.txt index bba3bb36696..b5f325478e1 100644 --- 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_cd_file(TARGET mstsc DESTINATION reactos/system32) diff --git a/base/applications/network/arp/CMakeLists.txt b/base/applications/network/arp/CMakeLists.txt index 7c0c0919ad5..44cfd7ece5a 100644 --- 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_cd_file(TARGET arp DESTINATION reactos/system32) diff --git a/base/applications/network/dwnl/CMakeLists.txt b/base/applications/network/dwnl/CMakeLists.txt index 195a9681b1a..a56eafadb09 100644 --- 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_cd_file(TARGET dwnl DESTINATION reactos/system32) diff --git a/base/applications/network/finger/CMakeLists.txt b/base/applications/network/finger/CMakeLists.txt index 9ac4d9e11f8..90947fa0d4a 100644 --- a/base/applications/network/finger/CMakeLists.txt +++ b/base/applications/network/finger/CMakeLists.txt @@ -12,4 +12,4 @@ add_executable(finger set_module_type(finger win32cui) add_importlibs(finger ws2_32 msvcrt kernel32) -add_cab_target(finger 1) +add_cd_file(TARGET finger DESTINATION reactos/system32) diff --git a/base/applications/network/ftp/CMakeLists.txt b/base/applications/network/ftp/CMakeLists.txt index 0d74b9ae47b..d9f24633267 100644 --- a/base/applications/network/ftp/CMakeLists.txt +++ b/base/applications/network/ftp/CMakeLists.txt @@ -21,4 +21,4 @@ if(MSVC) add_importlibs(ftp ntdll) endif() -add_cab_target(ftp 1) +add_cd_file(TARGET ftp DESTINATION reactos/system32) diff --git a/base/applications/network/ipconfig/CMakeLists.txt b/base/applications/network/ipconfig/CMakeLists.txt index ec18cf5bb14..214593b9c70 100644 --- a/base/applications/network/ipconfig/CMakeLists.txt +++ b/base/applications/network/ipconfig/CMakeLists.txt @@ -2,4 +2,4 @@ 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_cd_file(TARGET ipconfig DESTINATION reactos/system32) diff --git a/base/applications/network/net/CMakeLists.txt b/base/applications/network/net/CMakeLists.txt index aacb24749ce..353ff9a10e5 100644 --- a/base/applications/network/net/CMakeLists.txt +++ b/base/applications/network/net/CMakeLists.txt @@ -12,4 +12,4 @@ add_executable(net ${SOURCE}) set_module_type(net win32cui) add_importlibs(net ws2_32 msvcrt kernel32) -add_cab_target(net 1) +add_cd_file(TARGET net DESTINATION reactos/system32) diff --git a/base/applications/network/netstat/CMakeLists.txt b/base/applications/network/netstat/CMakeLists.txt index ee63313e407..1860bcade39 100644 --- a/base/applications/network/netstat/CMakeLists.txt +++ b/base/applications/network/netstat/CMakeLists.txt @@ -2,4 +2,4 @@ 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_cd_file(TARGET netstat DESTINATION reactos/system32) diff --git a/base/applications/network/nslookup/CMakeLists.txt b/base/applications/network/nslookup/CMakeLists.txt index 5d1c17fa01d..85e99fe1dc3 100644 --- a/base/applications/network/nslookup/CMakeLists.txt +++ b/base/applications/network/nslookup/CMakeLists.txt @@ -6,4 +6,4 @@ add_executable(nslookup set_module_type(nslookup win32cui) add_importlibs(nslookup user32 ws2_32 snmpapi iphlpapi msvcrt kernel32) -add_cab_target(nslookup 1) +add_cd_file(TARGET nslookup DESTINATION reactos/system32) diff --git a/base/applications/network/ping/CMakeLists.txt b/base/applications/network/ping/CMakeLists.txt index c9ef4c20fb7..442ac2795e3 100644 --- a/base/applications/network/ping/CMakeLists.txt +++ b/base/applications/network/ping/CMakeLists.txt @@ -13,4 +13,4 @@ if(MSVC) add_importlibs(ping ntdll) endif() -add_cab_target(ping 1) +add_cd_file(TARGET ping DESTINATION reactos/system32) diff --git a/base/applications/network/route/CMakeLists.txt b/base/applications/network/route/CMakeLists.txt index dd04f7366b8..fc0de74e5f8 100644 --- a/base/applications/network/route/CMakeLists.txt +++ b/base/applications/network/route/CMakeLists.txt @@ -7,4 +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_cd_file(TARGET route DESTINATION reactos/system32) diff --git a/base/applications/network/telnet/CMakeLists.txt b/base/applications/network/telnet/CMakeLists.txt index 2fe276431a9..67973df6761 100644 --- a/base/applications/network/telnet/CMakeLists.txt +++ b/base/applications/network/telnet/CMakeLists.txt @@ -29,4 +29,4 @@ add_executable(telnet set_module_type(telnet win32cui) add_importlibs(telnet ws2_32 user32 kernel32 msvcrt) -add_cab_target(telnet 1) +add_cd_file(TARGET telnet DESTINATION reactos/system32) diff --git a/base/applications/network/tracert/CMakeLists.txt b/base/applications/network/tracert/CMakeLists.txt index 9d6ad656787..75377ab8b9d 100644 --- a/base/applications/network/tracert/CMakeLists.txt +++ b/base/applications/network/tracert/CMakeLists.txt @@ -10,4 +10,4 @@ if(MSVC) add_importlibs(tracert ntdll) endif() -add_cab_target(tracert 1) +add_cd_file(TARGET tracert DESTINATION reactos/system32) diff --git a/base/applications/network/whois/CMakeLists.txt b/base/applications/network/whois/CMakeLists.txt index 66dab043aa6..e71dfa6ce16 100644 --- a/base/applications/network/whois/CMakeLists.txt +++ b/base/applications/network/whois/CMakeLists.txt @@ -5,4 +5,4 @@ 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_cd_file(TARGET whois DESTINATION reactos/system32) diff --git a/base/applications/notepad/CMakeLists.txt b/base/applications/notepad/CMakeLists.txt index b0fbb920694..9ed29ff36a2 100644 --- a/base/applications/notepad/CMakeLists.txt +++ b/base/applications/notepad/CMakeLists.txt @@ -14,4 +14,4 @@ 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) +add_cd_file(TARGET notepad DESTINATION reactos/system32) diff --git a/base/applications/rapps/CMakeLists.txt b/base/applications/rapps/CMakeLists.txt index f49f70d5c15..facdf43734b 100644 --- a/base/applications/rapps/CMakeLists.txt +++ b/base/applications/rapps/CMakeLists.txt @@ -32,4 +32,4 @@ target_link_libraries(rapps uuid) add_importlibs(rapps advapi32 comctl32 gdi32 urlmon user32 shell32 shlwapi kernel32 msvcrt ntdll) add_dependencies(rapps rappsmsg) add_message_headers(rappsmsg.mc) -add_cab_target(rapps 1) +add_cd_file(TARGET rapps DESTINATION reactos/system32) diff --git a/base/applications/regedit/CMakeLists.txt b/base/applications/regedit/CMakeLists.txt index 411aaeae7fb..24819be9286 100644 --- a/base/applications/regedit/CMakeLists.txt +++ b/base/applications/regedit/CMakeLists.txt @@ -34,4 +34,4 @@ add_importlibs(regedit user32 gdi32 advapi32 ole32 shell32 comctl32 comdlg32 shl #add_subdirectory(clb) -add_cab_target(regedit 4) +add_cd_file(TARGET regedit DESTINATION reactos) diff --git a/base/applications/regedt32/CMakeLists.txt b/base/applications/regedt32/CMakeLists.txt index 9dabef71530..b14849fed72 100644 --- a/base/applications/regedt32/CMakeLists.txt +++ b/base/applications/regedt32/CMakeLists.txt @@ -6,4 +6,4 @@ 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_cd_file(TARGET regedt32 DESTINATION reactos/system32) diff --git a/base/applications/sc/CMakeLists.txt b/base/applications/sc/CMakeLists.txt index 8de23372348..02601830750 100644 --- a/base/applications/sc/CMakeLists.txt +++ b/base/applications/sc/CMakeLists.txt @@ -19,4 +19,4 @@ 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_cd_file(TARGET sc DESTINATION reactos/system32) diff --git a/base/applications/screensavers/3dtext/CMakeLists.txt b/base/applications/screensavers/3dtext/CMakeLists.txt index 3f816149b39..38f89e39628 100644 --- 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_cd_file(TARGET 3dtext DESTINATION reactos/system32) diff --git a/base/applications/screensavers/logon/CMakeLists.txt b/base/applications/screensavers/logon/CMakeLists.txt index f909e2abdaf..74c4a2c2e77 100644 --- a/base/applications/screensavers/logon/CMakeLists.txt +++ b/base/applications/screensavers/logon/CMakeLists.txt @@ -9,4 +9,4 @@ 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_cd_file(TARGET logon DESTINATION reactos/system32) diff --git a/base/applications/shutdown/CMakeLists.txt b/base/applications/shutdown/CMakeLists.txt index f72303ebbbb..089879c6257 100644 --- a/base/applications/shutdown/CMakeLists.txt +++ b/base/applications/shutdown/CMakeLists.txt @@ -12,4 +12,4 @@ 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_cd_file(TARGET shutdown DESTINATION reactos/system32) diff --git a/base/applications/sndrec32/CMakeLists.txt b/base/applications/sndrec32/CMakeLists.txt index 464dd03497d..69471cc6e68 100644 --- a/base/applications/sndrec32/CMakeLists.txt +++ b/base/applications/sndrec32/CMakeLists.txt @@ -17,4 +17,4 @@ add_executable(sndrec32 target_link_libraries(sndrec32 stlport) set_module_type(sndrec32 win32gui) add_importlibs(sndrec32 winmm user32 msacm32 comctl32 comdlg32 gdi32 msvcrt kernel32) -add_cab_target(sndrec32 1) +add_cd_file(TARGET sndrec32 DESTINATION reactos/system32) diff --git a/base/applications/sndvol32/CMakeLists.txt b/base/applications/sndvol32/CMakeLists.txt index 09af75801b5..d39b0ed9009 100644 --- a/base/applications/sndvol32/CMakeLists.txt +++ b/base/applications/sndvol32/CMakeLists.txt @@ -16,4 +16,4 @@ 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_cd_file(TARGET sndvol32 DESTINATION reactos/system32) diff --git a/base/applications/taskmgr/CMakeLists.txt b/base/applications/taskmgr/CMakeLists.txt index 8a78ccc7f8d..36ded18f200 100644 --- a/base/applications/taskmgr/CMakeLists.txt +++ b/base/applications/taskmgr/CMakeLists.txt @@ -29,4 +29,4 @@ 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_cd_file(TARGET taskmgr DESTINATION reactos/system32) diff --git a/base/applications/winhlp32/CMakeLists.txt b/base/applications/winhlp32/CMakeLists.txt index 071c7684d72..faca38512d8 100644 --- a/base/applications/winhlp32/CMakeLists.txt +++ b/base/applications/winhlp32/CMakeLists.txt @@ -23,4 +23,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_cd_file(TARGET winhlp32 DESTINATION reactos) diff --git a/base/applications/winver/CMakeLists.txt b/base/applications/winver/CMakeLists.txt index 76bb3f2a588..a032c8c8664 100644 --- a/base/applications/winver/CMakeLists.txt +++ b/base/applications/winver/CMakeLists.txt @@ -4,4 +4,4 @@ set_unicode() add_executable(winver winver.c) set_module_type(winver win32gui) add_importlibs(winver shell32 msvcrt kernel32) -add_cab_target(winver 1) +add_cd_file(TARGET winver DESTINATION reactos/system32) diff --git a/base/applications/wordpad/CMakeLists.txt b/base/applications/wordpad/CMakeLists.txt index 6b13acb274e..a5817a324d7 100644 --- a/base/applications/wordpad/CMakeLists.txt +++ b/base/applications/wordpad/CMakeLists.txt @@ -20,4 +20,4 @@ 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_cd_file(TARGET wordpad DESTINATION reactos/system32) diff --git a/base/applications/write/CMakeLists.txt b/base/applications/write/CMakeLists.txt index a528a5ec846..865f0dfa4ab 100644 --- a/base/applications/write/CMakeLists.txt +++ b/base/applications/write/CMakeLists.txt @@ -4,4 +4,4 @@ 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_cd_file(TARGET write DESTINATION reactos/system32) diff --git a/base/services/audiosrv/CMakeLists.txt b/base/services/audiosrv/CMakeLists.txt index 55271c46b06..48b9db6cac3 100644 --- a/base/services/audiosrv/CMakeLists.txt +++ b/base/services/audiosrv/CMakeLists.txt @@ -12,4 +12,4 @@ add_executable(audiosrv set_module_type(audiosrv win32cui) add_importlibs(audiosrv advapi32 user32 setupapi msvcrt kernel32) -add_cab_target(audiosrv 1) +add_cd_file(TARGET audiosrv DESTINATION reactos/system32) diff --git a/base/services/eventlog/CMakeLists.txt b/base/services/eventlog/CMakeLists.txt index a8f5b4aebb7..5eb0a3841d6 100644 --- a/base/services/eventlog/CMakeLists.txt +++ b/base/services/eventlog/CMakeLists.txt @@ -19,4 +19,4 @@ add_pch(eventlog ${CMAKE_CURRENT_SOURCE_DIR}/eventlog.h ${SOURCE}) set_module_type(eventlog win32cui) add_importlibs(eventlog advapi32 rpcrt4 msvcrt kernel32 ntdll) -add_cab_target(eventlog 1) +add_cd_file(TARGET eventlog DESTINATION reactos/system32) diff --git a/base/services/rpcss/CMakeLists.txt b/base/services/rpcss/CMakeLists.txt index 3ea2156b101..64a99c878f2 100644 --- a/base/services/rpcss/CMakeLists.txt +++ b/base/services/rpcss/CMakeLists.txt @@ -17,5 +17,5 @@ target_link_libraries(rpcss epmrpc irotrpc ${PSEH_LIB} wine) set_module_type(rpcss win32cui) add_importlibs(rpcss advapi32 rpcrt4 msvcrt kernel32 ntdll) -add_cab_target(rpcss 1) +add_cd_file(TARGET rpcss DESTINATION reactos/system32) add_dependencies(rpcss winesdk) diff --git a/base/services/spoolsv/CMakeLists.txt b/base/services/spoolsv/CMakeLists.txt index 99feb7174ef..ff9b91e5a27 100644 --- a/base/services/spoolsv/CMakeLists.txt +++ b/base/services/spoolsv/CMakeLists.txt @@ -7,4 +7,4 @@ target_link_libraries(spoolsv wine) set_module_type(spoolsv win32cui) add_importlibs(spoolsv advapi32 msvcrt kernel32 ntdll) -add_cab_target(spoolsv 1) +add_cd_file(TARGET spoolsv DESTINATION reactos/system32) diff --git a/base/services/svchost/CMakeLists.txt b/base/services/svchost/CMakeLists.txt index f4188a2e6c0..8b18ac6b41d 100644 --- a/base/services/svchost/CMakeLists.txt +++ b/base/services/svchost/CMakeLists.txt @@ -3,4 +3,4 @@ add_executable(svchost svchost.c svchost.rc) set_module_type(svchost win32cui) add_importlibs(svchost advapi32 msvcrt kernel32 ntdll) -add_cab_target(svchost 1) +add_cd_file(TARGET svchost DESTINATION reactos/system32) diff --git a/base/services/tcpsvcs/CMakeLists.txt b/base/services/tcpsvcs/CMakeLists.txt index b0810d17338..3eb53dea874 100644 --- a/base/services/tcpsvcs/CMakeLists.txt +++ b/base/services/tcpsvcs/CMakeLists.txt @@ -19,5 +19,5 @@ 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) \ No newline at end of file +add_cd_file(TARGET tcpsvcs DESTINATION reactos/system32) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/quotes DESTINATION reactos/system32/drivers/etc) \ No newline at end of file diff --git a/base/services/telnetd/CMakeLists.txt b/base/services/telnetd/CMakeLists.txt index d803319da68..71880bb97fe 100644 --- a/base/services/telnetd/CMakeLists.txt +++ b/base/services/telnetd/CMakeLists.txt @@ -10,4 +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) +add_cd_file(TARGET telnetd DESTINATION reactos/system32) diff --git a/base/services/umpnpmgr/CMakeLists.txt b/base/services/umpnpmgr/CMakeLists.txt index 03ccbec6ab0..5ed8fb3425c 100644 --- a/base/services/umpnpmgr/CMakeLists.txt +++ b/base/services/umpnpmgr/CMakeLists.txt @@ -11,4 +11,4 @@ target_link_libraries(umpnpmgr pnprpc wdmguid ${PSEH_LIB}) set_module_type(umpnpmgr win32cui) add_importlibs(umpnpmgr advapi32 rpcrt4 userenv msvcrt kernel32 ntdll) -add_cab_target(umpnpmgr 1) +add_cd_file(TARGET umpnpmgr DESTINATION reactos/system32) diff --git a/base/services/wlansvc/CMakeLists.txt b/base/services/wlansvc/CMakeLists.txt index 284e925e6a0..9dbecd8d868 100644 --- a/base/services/wlansvc/CMakeLists.txt +++ b/base/services/wlansvc/CMakeLists.txt @@ -8,4 +8,4 @@ target_link_libraries(wlansvc wlansvcrpc ${PSEH_LIB}) set_module_type(wlansvc win32cui) add_importlibs(wlansvc advapi32 rpcrt4 iphlpapi msvcrt kernel32 ntdll) -add_cab_target(wlansvc 1) +add_cd_file(TARGET wlansvc DESTINATION reactos/system32) diff --git a/base/setup/reactos/CMakeLists.txt b/base/setup/reactos/CMakeLists.txt index 3a0ceb6eb12..4d65761183e 100644 --- a/base/setup/reactos/CMakeLists.txt +++ b/base/setup/reactos/CMakeLists.txt @@ -8,4 +8,4 @@ target_link_libraries(reactos uuid) set_module_type(reactos win32gui) add_importlibs(reactos gdi32 user32 comctl32 setupapi msvcrt kernel32 ntdll) -add_minicd_target(reactos reactos) +add_cd_file(TARGET reactos DESTINATION reactos NO_CAB NO_LIVECD) diff --git a/base/setup/setup/CMakeLists.txt b/base/setup/setup/CMakeLists.txt index 27a9f644ef3..36c57a34426 100644 --- a/base/setup/setup/CMakeLists.txt +++ b/base/setup/setup/CMakeLists.txt @@ -5,4 +5,4 @@ add_executable(setup setup.c setup.rc) set_module_type(setup win32gui) add_importlibs(setup userenv msvcrt kernel32 ntdll) -add_cab_target(setup 1) +add_cd_file(TARGET setup DESTINATION reactos/system32) diff --git a/base/setup/usetup/CMakeLists.txt b/base/setup/usetup/CMakeLists.txt index 269fd741bab..9a086c5fa57 100644 --- a/base/setup/usetup/CMakeLists.txt +++ b/base/setup/usetup/CMakeLists.txt @@ -44,4 +44,4 @@ endif() set_module_type(usetup nativecui) add_importlibs(usetup kernel32 ntdll) -add_minicd_target(usetup reactos/system32 smss.exe) +add_cd_file(TARGET usetup DESTINATION reactos/system32 NO_CAB NO_LIVECD NAME_ON_CD smss.exe) diff --git a/base/setup/usetup/filesup.c b/base/setup/usetup/filesup.c index f0d8152e1f9..0051b0abed0 100644 --- a/base/setup/usetup/filesup.c +++ b/base/setup/usetup/filesup.c @@ -126,7 +126,7 @@ SetupCopyFile(PWCHAR SourceFileName, FILE_SEQUENTIAL_ONLY); if(!NT_SUCCESS(Status)) { - DPRINT1("NtOpenFile failed: %x\n", Status); + DPRINT1("NtOpenFile failed: %x, %wZ\n", Status, &FileName); goto done; } #else diff --git a/base/setup/usetup/interface/usetup.c b/base/setup/usetup/interface/usetup.c index 9fa6d32fdf3..e839735065a 100644 --- a/base/setup/usetup/interface/usetup.c +++ b/base/setup/usetup/interface/usetup.c @@ -2843,6 +2843,7 @@ AddSectionToCopyQueue(HINF InfFile, PWCHAR FileKeyValue; PWCHAR DirKeyValue; PWCHAR TargetFileName; + WCHAR CompleteOrigFileName[512]; if (SourceCabinet) return AddSectionToCopyQueueCab(InfFile, L"SourceFiles", SourceCabinet, DestinationPath, Ir); @@ -2901,10 +2902,14 @@ AddSectionToCopyQueue(HINF InfFile, break; } + wcscpy(CompleteOrigFileName, SourceRootDir.Buffer); + wcscat(CompleteOrigFileName, L"\\"); + wcscat(CompleteOrigFileName, DirKeyValue); + if (!SetupQueueCopy(SetupFileQueue, SourceCabinet, SourceRootPath.Buffer, - SourceRootDir.Buffer, + CompleteOrigFileName, FileKeyName, DirKeyValue, TargetFileName)) diff --git a/base/setup/vmwinst/CMakeLists.txt b/base/setup/vmwinst/CMakeLists.txt index 38ea15e5ffc..438f99388cb 100644 --- a/base/setup/vmwinst/CMakeLists.txt +++ b/base/setup/vmwinst/CMakeLists.txt @@ -18,4 +18,4 @@ add_importlibs(vmwinst kernel32 ntdll) -add_cab_target(vmwinst 1) +add_cd_file(TARGET vmwinst DESTINATION reactos/system32) diff --git a/base/setup/welcome/CMakeLists.txt b/base/setup/welcome/CMakeLists.txt index de502268d7a..26b545bb25a 100644 --- a/base/setup/welcome/CMakeLists.txt +++ b/base/setup/welcome/CMakeLists.txt @@ -5,4 +5,4 @@ add_executable(welcome welcome.c welcome.rc) set_module_type(welcome win32gui) add_importlibs(welcome gdi32 user32 msvcrt kernel32 ntdll) -add_minicd_target(welcome reactos) +add_cd_file(TARGET welcome DESTINATION reactos NO_CAB NO_LIVECD) diff --git a/base/shell/cmd/CMakeLists.txt b/base/shell/cmd/CMakeLists.txt index 97692babe95..5b066903f29 100644 --- a/base/shell/cmd/CMakeLists.txt +++ b/base/shell/cmd/CMakeLists.txt @@ -79,4 +79,4 @@ 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_cab_target(cmd 1) +add_cd_file(TARGET cmd DESTINATION reactos/system32) diff --git a/base/shell/explorer-new/CMakeLists.txt b/base/shell/explorer-new/CMakeLists.txt index cd581cc9b2a..1ab9228531c 100644 --- a/base/shell/explorer-new/CMakeLists.txt +++ b/base/shell/explorer-new/CMakeLists.txt @@ -38,4 +38,4 @@ add_importlibs(explorer_new kernel32 ntdll) -add_cab_target(explorer_new 4) +add_cd_file(TARGET explorer_new DESTINATION reactos) diff --git a/base/shell/explorer/CMakeLists.txt b/base/shell/explorer/CMakeLists.txt index 295e5b1305e..f5d9b99b26e 100644 --- a/base/shell/explorer/CMakeLists.txt +++ b/base/shell/explorer/CMakeLists.txt @@ -73,5 +73,5 @@ add_importlibs(explorer advapi32 gdi32 user32 ws2_32 msimg32 comctl32 ole32 olea set_image_base(explorer 0x00400000) add_dependencies(explorer psdk) -add_cab_target(explorer 4) -add_cab(${CMAKE_CURRENT_SOURCE_DIR}/explorer-cfg-template.xml 4) +add_cd_file(TARGET explorer DESTINATION reactos) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/explorer-cfg-template.xml DESTINATION reactos) diff --git a/base/shell/explorer/notifyhook/CMakeLists.txt b/base/shell/explorer/notifyhook/CMakeLists.txt index 4c3bda27a76..f0921c9f032 100644 --- a/base/shell/explorer/notifyhook/CMakeLists.txt +++ b/base/shell/explorer/notifyhook/CMakeLists.txt @@ -14,4 +14,4 @@ set_module_type(notifyhook win32dll) add_importlibs(notifyhook user32 msvcrt kernel32) add_importlib_target(notifyhook.spec) -add_cab_target(notifyhook 1) +add_cd_file(TARGET notifyhook DESTINATION reactos/system32) diff --git a/base/system/autochk/CMakeLists.txt b/base/system/autochk/CMakeLists.txt index c1846543d46..d1a9d6015d4 100644 --- a/base/system/autochk/CMakeLists.txt +++ b/base/system/autochk/CMakeLists.txt @@ -5,4 +5,4 @@ set_module_type(autochk nativecui) target_link_libraries(autochk mingw_common nt) add_importlibs(autochk kernel32 ntdll) -add_cab_target(autochk 1) +add_cd_file(TARGET autochk DESTINATION reactos/system32) diff --git a/base/system/bootok/CMakeLists.txt b/base/system/bootok/CMakeLists.txt index 9d8b1048cf4..d20653ca384 100644 --- a/base/system/bootok/CMakeLists.txt +++ b/base/system/bootok/CMakeLists.txt @@ -7,4 +7,4 @@ add_executable(bootok bootok.c bootok.rc) set_module_type(bootok win32cui) add_importlibs(bootok advapi32 msvcrt kernel32 ntdll) -add_cab_target(bootok 1) +add_cd_file(TARGET bootok DESTINATION reactos/system32) diff --git a/base/system/expand/CMakeLists.txt b/base/system/expand/CMakeLists.txt index cb393eb585c..162421dfac2 100644 --- a/base/system/expand/CMakeLists.txt +++ b/base/system/expand/CMakeLists.txt @@ -7,4 +7,4 @@ 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) +add_cd_file(TARGET expand DESTINATION reactos/system32) diff --git a/base/system/format/CMakeLists.txt b/base/system/format/CMakeLists.txt index 6b4d2809d40..e3e7674bb56 100644 --- a/base/system/format/CMakeLists.txt +++ b/base/system/format/CMakeLists.txt @@ -8,4 +8,4 @@ add_executable(format format.c format.rc) set_module_type(format win32cui) add_importlibs(format user32 fmifs msvcrt kernel32 ntdll) -add_cab_target(format 1) +add_cd_file(TARGET format DESTINATION reactos/system32) diff --git a/base/system/lsass/CMakeLists.txt b/base/system/lsass/CMakeLists.txt index 516f416405f..62a77a0de66 100644 --- a/base/system/lsass/CMakeLists.txt +++ b/base/system/lsass/CMakeLists.txt @@ -7,4 +7,4 @@ add_executable(lsass lsass.c lsass.rc) set_module_type(lsass win32gui) add_importlibs(lsass advapi32 lsasrv msvcrt kernel32 ntdll) -add_cab_target(lsass 1) +add_cd_file(TARGET lsass DESTINATION reactos/system32) diff --git a/base/system/msiexec/CMakeLists.txt b/base/system/msiexec/CMakeLists.txt index c2b6a247671..f61a3f7129d 100644 --- a/base/system/msiexec/CMakeLists.txt +++ b/base/system/msiexec/CMakeLists.txt @@ -16,4 +16,4 @@ set_module_type(msiexec win32gui) target_link_libraries(msiexec uuid wine) add_importlibs(msiexec user32 advapi32 ole32 msi msvcrt kernel32 ntdll) -add_cab_target(msiexec 1) +add_cd_file(TARGET msiexec DESTINATION reactos/system32) diff --git a/base/system/regsvr32/CMakeLists.txt b/base/system/regsvr32/CMakeLists.txt index e676c20de99..a70c8ae57ea 100644 --- a/base/system/regsvr32/CMakeLists.txt +++ b/base/system/regsvr32/CMakeLists.txt @@ -9,4 +9,4 @@ 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) +add_cd_file(TARGET regsvr32 DESTINATION reactos/system32) diff --git a/base/system/rundll32/CMakeLists.txt b/base/system/rundll32/CMakeLists.txt index bb43fc1b9c5..3503cd6241c 100644 --- a/base/system/rundll32/CMakeLists.txt +++ b/base/system/rundll32/CMakeLists.txt @@ -7,4 +7,4 @@ add_executable(rundll32 rundll32.c rundll32.rc) set_module_type(rundll32 win32gui) add_importlibs(rundll32 user32 msvcrt kernel32 ntdll) -add_cab_target(rundll32 1) +add_cd_file(TARGET rundll32 DESTINATION reactos/system32) diff --git a/base/system/runonce/CMakeLists.txt b/base/system/runonce/CMakeLists.txt index 62f759553f8..8de7c048951 100644 --- a/base/system/runonce/CMakeLists.txt +++ b/base/system/runonce/CMakeLists.txt @@ -6,4 +6,4 @@ 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) +add_cd_file(TARGET runonce DESTINATION reactos/system32) diff --git a/base/system/services/CMakeLists.txt b/base/system/services/CMakeLists.txt index ef34a52d19e..c4a78ce92b8 100644 --- a/base/system/services/CMakeLists.txt +++ b/base/system/services/CMakeLists.txt @@ -24,4 +24,4 @@ add_pch(services ${CMAKE_CURRENT_SOURCE_DIR}/services.h ${SOURCE}) set_module_type(services win32cui) add_importlibs(services user32 advapi32 rpcrt4 msvcrt kernel32 ntdll) -add_cab_target(services 1) +add_cd_file(TARGET services DESTINATION reactos/system32) diff --git a/base/system/smss/CMakeLists.txt b/base/system/smss/CMakeLists.txt index 2d9bd19d2e5..0e6513d94da 100644 --- a/base/system/smss/CMakeLists.txt +++ b/base/system/smss/CMakeLists.txt @@ -35,4 +35,4 @@ add_pch(smss ${CMAKE_CURRENT_SOURCE_DIR}/smss.h ${SOURCE}) set_module_type(smss nativecui) add_importlibs(smss ntdll) -add_cab_target(smss 1) +add_cd_file(TARGET smss DESTINATION reactos/system32) diff --git a/base/system/subst/CMakeLists.txt b/base/system/subst/CMakeLists.txt index 89104454b7a..bb6dc95767f 100644 --- a/base/system/subst/CMakeLists.txt +++ b/base/system/subst/CMakeLists.txt @@ -8,4 +8,4 @@ add_executable(subst subst.c subst.rc) set_module_type(subst win32cui) add_importlibs(subst msvcrt kernel32 user32 ntdll) -add_cab_target(subst 1) +add_cd_file(TARGET subst DESTINATION reactos/system32) diff --git a/base/system/userinit/CMakeLists.txt b/base/system/userinit/CMakeLists.txt index 66bd8f9a30f..8937b3123b4 100644 --- a/base/system/userinit/CMakeLists.txt +++ b/base/system/userinit/CMakeLists.txt @@ -9,4 +9,4 @@ target_link_libraries(userinit wine) set_module_type(userinit win32gui) add_importlibs(userinit user32 gdi32 advapi32 shell32 shlwapi msvcrt kernel32 ntdll) -add_cab_target(userinit 1) +add_cd_file(TARGET userinit DESTINATION reactos/system32) diff --git a/base/system/winlogon/CMakeLists.txt b/base/system/winlogon/CMakeLists.txt index b411d0dad49..1fec3964e2d 100644 --- a/base/system/winlogon/CMakeLists.txt +++ b/base/system/winlogon/CMakeLists.txt @@ -16,4 +16,4 @@ add_pch(winlogon ${CMAKE_CURRENT_SOURCE_DIR}/winlogon.h ${SOURCE}) set_module_type(winlogon win32gui) add_importlibs(winlogon user32 advapi32 userenv secur32 msvcrt kernel32 ntdll) -add_cab_target(winlogon 1) +add_cd_file(TARGET winlogon DESTINATION reactos/system32) diff --git a/boot/CMakeLists.txt b/boot/CMakeLists.txt index d19e3f138d4..6a2d7ad30dc 100644 --- a/boot/CMakeLists.txt +++ b/boot/CMakeLists.txt @@ -1,28 +1,14 @@ +#clear it out +file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/bootcd.cmake + "file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bootcd)\n") + +add_custom_target(bootcd + ${CMAKE_COMMAND} -D CD_DIR=${CMAKE_CURRENT_BINARY_DIR}/bootcd + -P ${CMAKE_CURRENT_BINARY_DIR}/bootcd.cmake + COMMAND native-cdmake -v -j -m -b ${CMAKE_CURRENT_BINARY_DIR}/freeldr/bootsect/isoboot.bin ${BOOTCD_DIR} REACTOS ${REACTOS_BINARY_DIR}/bootcd.iso + #DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/bootcd.cmake + VERBATIM) + add_subdirectory(freeldr) - -add_minicd(${CMAKE_CURRENT_SOURCE_DIR}/bootdata/txtsetup.sif reactos txtsetup.sif) -add_minicd(${CMAKE_CURRENT_SOURCE_DIR}/bootdata/bootcd.ini "" freeldr.ini) -add_minicd(${CMAKE_CURRENT_SOURCE_DIR}/bootdata/hivecls_${ARCH}.inf reactos hivecls.inf) -add_minicd(${CMAKE_CURRENT_SOURCE_DIR}/bootdata/hivedef_${ARCH}.inf reactos hivedef.inf) -add_minicd(${CMAKE_CURRENT_SOURCE_DIR}/bootdata/hivesft_${ARCH}.inf reactos hivesft.inf) -add_minicd(${CMAKE_CURRENT_SOURCE_DIR}/bootdata/hivesys_${ARCH}.inf reactos hivesys.inf) -add_minicd(${CMAKE_CURRENT_SOURCE_DIR}/bootdata/autorun.inf "" autorun.inf) -add_minicd(${CMAKE_CURRENT_SOURCE_DIR}/bootdata/icon.ico "" icon.ico) -add_minicd(${CMAKE_CURRENT_SOURCE_DIR}/bootdata/readme.txt "" readme.txt) -# Livecd files -list(APPEND LIVECD_HIVES - ${CMAKE_CURRENT_SOURCE_DIR}/bootdata/livecd.inf - ${CMAKE_CURRENT_SOURCE_DIR}/bootdata/hiveinst_${ARCH}.inf) - -add_custom_command( - OUTPUT ${LIVECD_DIR}/reactos/system32/config/sam - COMMAND native-mkhive ${CMAKE_CURRENT_SOURCE_DIR}/bootdata ${LIVECD_DIR}/reactos/system32/config ${ARCH} ${LIVECD_HIVES} - DEPENDS native-mkhive) - -add_custom_target(livecd_hives DEPENDS ${LIVECD_DIR}/reactos/system32/config/sam) - -add_livecd(${REACTOS_SOURCE_DIR}/boot/bootdata/livecd.ini "" freeldr.ini) - -#regtest -add_cab(${REACTOS_SOURCE_DIR}/boot/bootdata/bootcdregtest/regtest.cmd 7) +add_subdirectory(bootdata) diff --git a/boot/bootdata/CMakeLists.txt b/boot/bootdata/CMakeLists.txt new file mode 100644 index 00000000000..22d731e8f2c --- /dev/null +++ b/boot/bootdata/CMakeLists.txt @@ -0,0 +1,23 @@ + +add_subdirectory(packages) + +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/txtsetup.sif DESTINATION reactos NO_CAB NO_LIVECD) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/hivecls_${ARCH}.inf DESTINATION reactos NO_CAB NO_LIVECD NAME_ON_CD hivecls.inf) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/hivedef_${ARCH}.inf DESTINATION reactos NO_CAB NO_LIVECD NAME_ON_CD hivedef.inf) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/hivesft_${ARCH}.inf DESTINATION reactos NO_CAB NO_LIVECD NAME_ON_CD hivesft.inf) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/hivesys_${ARCH}.inf DESTINATION reactos NO_CAB NAME_ON_CD hivesys.inf) + +# bootcd/livecd hives +list(APPEND CD_HIVES + ${CMAKE_CURRENT_SOURCE_DIR}/livecd.inf + ${CMAKE_CURRENT_SOURCE_DIR}/hiveinst_${ARCH}.inf) + +add_custom_target(livecd_hives + native-mkhive ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${ARCH} ${CD_HIVES} + DEPENDS native-mkhive ${CD_HIVES}) + +#regtest +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/bootcdregtest/regtest.cmd DESTINATION reactos/bin) + +#freeldr.ini +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/bootcd.ini DESTINATION root NO_CAB NAME_ON_CD freeldr.ini NO_LIVECD) diff --git a/boot/bootdata/packages/CMakeLists.txt b/boot/bootdata/packages/CMakeLists.txt new file mode 100644 index 00000000000..07b2fd02846 --- /dev/null +++ b/boot/bootdata/packages/CMakeLists.txt @@ -0,0 +1,45 @@ +#reactos.dff + +# reactos.dff is the concatenation of two files : +# - reactos.dff.in, which is a static one and can be altered to +# add custom modules/files to reactos.cab +# - reactos.dff.dyn (dyn as dynamic) which is generated at configure time by our cmake scripts +# If you want to slip-stream anything into the bootcd, then you want to alter reactos.dff.in + +# Idea taken from there : http://www.cmake.org/pipermail/cmake/2010-July/038028.html +file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/concat.cmake " + file(READ \${SRC1} S1) + file(READ \${SRC2} S2) + file(WRITE \${DST} \"\${S1}\${S2}\") +") + +file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff.dyn "") + +add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff + COMMAND ${CMAKE_COMMAND} -D SRC1=${CMAKE_CURRENT_SOURCE_DIR}/reactos.dff.in + -D SRC2=${CMAKE_CURRENT_BINARY_DIR}/reactos.dff.dyn + -D DST=${CMAKE_CURRENT_BINARY_DIR}/reactos.dff + -P ${CMAKE_CURRENT_BINARY_DIR}/concat.cmake + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/reactos.dff.in + DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff.dyn +) + +# And now we build reactos.cab +add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf + COMMAND native-cabman -C ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff -L ${CMAKE_CURRENT_BINARY_DIR} -I -P ${REACTOS_SOURCE_DIR} + DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff +) +# add_custom_command( + # OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/reactos.cab + # COMMAND native-cabman -C ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff -RC ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf -L ${CMAKE_CURRENT_BINARY_DIR} -N -P ${REACTOS_SOURCE_DIR} + # DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf +# ) + +add_custom_target(reactos_cab + native-cabman -C ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff -RC ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf -L ${CMAKE_CURRENT_BINARY_DIR} -N -P ${REACTOS_SOURCE_DIR} + DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf + VERBATIM) + +add_cd_file(TARGET reactos_cab FILE ${CMAKE_CURRENT_BINARY_DIR}/reactos.cab ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf DESTINATION reactos NO_CAB NO_LIVECD) diff --git a/boot/bootdata/packages/reactos.dff.in b/boot/bootdata/packages/reactos.dff.in index b5789d1ef85..cb44b08862a 100644 --- a/boot/bootdata/packages/reactos.dff.in +++ b/boot/bootdata/packages/reactos.dff.in @@ -1,3 +1,4 @@ + ; Main ReactOS package .Set DiskLabelTemplate="ReactOS" ; Label of disk diff --git a/boot/bootdata/txtsetup.sif b/boot/bootdata/txtsetup.sif index fb0937edbb2..183ee5b1089 100644 --- a/boot/bootdata/txtsetup.sif +++ b/boot/bootdata/txtsetup.sif @@ -39,7 +39,13 @@ pci.sys=,,,,,,,,,,,,4 scsiport.sys=,,,,,,x,,,,,,4 fastfat.sys=,,,,,,x,,,,,,4 ramdisk.sys=,,,,,,x,,,,,,4 -ext2.sys=,,,,,,x,,,,,,4 +ext2fs.sys=,,,,,,x,,,,,,4 +vgafonts.cab=,,,,,,,,,,,,1 +classpnp.sys=,,,,,,,,,,,,4 +pcix.sys=,,,,,,,,,,,,4 +pcmcia.sys=,,,,,,,,,,,,4 +swenum.sys=,,,,,,,,,,,,4 +ntdll.dll=,,,,,,,,,,,,2 [HardwareIdsDatabase] ;*PNP0A00 = isapnp diff --git a/boot/freeldr/bootsect/CMakeLists.txt b/boot/freeldr/bootsect/CMakeLists.txt index 2ef8f3aaffa..5ce8b56a35c 100644 --- a/boot/freeldr/bootsect/CMakeLists.txt +++ b/boot/freeldr/bootsect/CMakeLists.txt @@ -4,4 +4,11 @@ CreateBootSectorTarget(ext2 ${CMAKE_CURRENT_SOURCE_DIR}/ext2.asm ${CMAKE_CURRENT CreateBootSectorTarget(fat32 ${CMAKE_CURRENT_SOURCE_DIR}/fat32.asm ${CMAKE_CURRENT_BINARY_DIR}/fat32.bin) CreateBootSectorTarget(fat ${CMAKE_CURRENT_SOURCE_DIR}/fat.asm ${CMAKE_CURRENT_BINARY_DIR}/fat.bin) CreateBootSectorTarget(isoboot ${CMAKE_CURRENT_SOURCE_DIR}/isoboot.asm ${CMAKE_CURRENT_BINARY_DIR}/isoboot.bin) -CreateBootSectorTarget(isobtrt ${CMAKE_CURRENT_SOURCE_DIR}/isobtrt.asm ${CMAKE_CURRENT_BINARY_DIR}/isobtrt.bin) \ No newline at end of file +CreateBootSectorTarget(isobtrt ${CMAKE_CURRENT_SOURCE_DIR}/isobtrt.asm ${CMAKE_CURRENT_BINARY_DIR}/isobtrt.bin) + +add_cd_file(TARGET dosmbr DESTINATION loader NO_CAB FILE ${CMAKE_CURRENT_BINARY_DIR}/dosmbr.bin) +add_cd_file(TARGET ext2 DESTINATION loader NO_CAB FILE ${CMAKE_CURRENT_BINARY_DIR}/ext2.bin) +add_cd_file(TARGET fat32 DESTINATION loader NO_CAB FILE ${CMAKE_CURRENT_BINARY_DIR}/fat32.bin) +add_cd_file(TARGET fat DESTINATION loader NO_CAB FILE ${CMAKE_CURRENT_BINARY_DIR}/fat.bin) +add_cd_file(TARGET isoboot DESTINATION loader NO_CAB FILE ${CMAKE_CURRENT_BINARY_DIR}/isoboot.bin) +add_cd_file(TARGET isobtrt DESTINATION loader NO_CAB FILE ${CMAKE_CURRENT_BINARY_DIR}/isobtrt.bin) \ No newline at end of file diff --git a/boot/freeldr/freeldr/CMakeLists.txt b/boot/freeldr/freeldr/CMakeLists.txt index 05e8a632e0a..5fd8e4ec33e 100644 --- a/boot/freeldr/freeldr/CMakeLists.txt +++ b/boot/freeldr/freeldr/CMakeLists.txt @@ -192,6 +192,8 @@ target_link_libraries(freeldr add_pch(freeldr ${CMAKE_CURRENT_SOURCE_DIR}/include/freeldr.h ${FREELDR_SOURCE}) add_dependencies(freeldr asm) +add_cd_file(TARGET freeldr DESTINATION loader NO_CAB) + list(APPEND SETUPLDR_MAIN_SOURCE bootmgr.c inffile/inffile.c @@ -237,7 +239,5 @@ target_link_libraries(setupldr add_dependencies(setupldr asm) -# Bootcd files -add_minicd_target(setupldr loader setupldr.sys) -add_minicd_target(freeldr loader freeldr.sys) -add_livecd_target(setupldr loader) +add_cd_file(TARGET setupldr DESTINATION loader NO_CAB) + diff --git a/boot/freeldr/freeldr/windows/setupldr2.c b/boot/freeldr/freeldr/windows/setupldr2.c index fd737752c90..58ee4d89d31 100644 --- a/boot/freeldr/freeldr/windows/setupldr2.c +++ b/boot/freeldr/freeldr/windows/setupldr2.c @@ -109,11 +109,11 @@ SetupLdrLoadNlsData(PLOADER_PARAMETER_BLOCK LoaderBlock, HINF InfHandle, LPCSTR VOID SetupLdrScanBootDrivers(PLOADER_PARAMETER_BLOCK LoaderBlock, HINF InfHandle, LPCSTR SearchPath) { - INFCONTEXT InfContext; + INFCONTEXT InfContext, dirContext; BOOLEAN Status; - LPCSTR Media, DriverName; + LPCSTR Media, DriverName, dirIndex, ImagePath; WCHAR ServiceName[256]; - WCHAR ImagePath[256]; + WCHAR ImagePathW[256]; /* Open inf section */ if (!InfFindFirstLine(InfHandle, "SourceDisksFiles", NULL, &InfContext)) @@ -123,23 +123,28 @@ SetupLdrScanBootDrivers(PLOADER_PARAMETER_BLOCK LoaderBlock, HINF InfHandle, LPC do { if (InfGetDataField(&InfContext, 7, &Media) && - InfGetDataField(&InfContext, 0, &DriverName)) + InfGetDataField(&InfContext, 0, &DriverName) && + InfGetDataField(&InfContext, 13, &dirIndex)) { - if (strcmp(Media, "x") == 0) + if ((strcmp(Media, "x") == 0) && + InfFindFirstLine(InfHandle, "Directories", dirIndex, &dirContext) && + InfGetDataField(&dirContext, 1, &ImagePath)) { /* Convert name to widechar */ swprintf(ServiceName, L"%S", DriverName); + /* Prepare image path */ + swprintf(ImagePathW, L"%S", ImagePath); + wcscat(ImagePathW, L"\\"); + wcscat(ImagePathW, ServiceName); + /* Remove .sys extension */ ServiceName[wcslen(ServiceName) - 4] = 0; - /* Prepare image path */ - swprintf(ImagePath, L"%S", DriverName); - /* Add it to the list */ Status = WinLdrAddDriverToList(&LoaderBlock->BootDriverListHead, L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\", - ImagePath, + ImagePathW, ServiceName); if (!Status) @@ -278,37 +283,46 @@ VOID LoadReactOSSetup2(VOID) /* Load kernel */ strcpy(FileName+strlen("\\ArcName\\"), BootPath); - strcat(FileName, "NTOSKRNL.EXE"); + strcat(FileName, "SYSTEM32\\NTOSKRNL.EXE"); Status = WinLdrLoadImage(FileName+strlen("\\ArcName\\"), LoaderSystemCode, &NtosBase); DPRINTM(DPRINT_WINDOWS, "Ntos loaded with status %d at %p\n", Status, NtosBase); - WinLdrAllocateDataTableEntry(LoaderBlock, "ntoskrnl.exe", + Status = WinLdrAllocateDataTableEntry(LoaderBlock, "ntoskrnl.exe", FileName, NtosBase, &KernelDTE); + DPRINTM(DPRINT_WINDOWS, "Ntos Data Table Entry allocated with status %d at %p\n", Status, KernelDTE); /* Load HAL */ strcpy(FileName+strlen("\\ArcName\\"), BootPath); - strcat(FileName, "HAL.DLL"); + strcat(FileName, "SYSTEM32\\HAL.DLL"); Status = WinLdrLoadImage(FileName+strlen("\\ArcName\\"), LoaderHalCode, &HalBase); DPRINTM(DPRINT_WINDOWS, "HAL loaded with status %d at %p\n", Status, HalBase); - WinLdrAllocateDataTableEntry(LoaderBlock, "hal.dll", + Status = WinLdrAllocateDataTableEntry(LoaderBlock, "hal.dll", FileName, HalBase, &HalDTE); + DPRINTM(DPRINT_WINDOWS, "HAL Data Table Entry allocated with status %d at %p\n", Status, HalDTE); /* Load kernel-debugger support dll */ strcpy(FileName+strlen("\\ArcName\\"), BootPath); - strcat(FileName, "KDCOM.DLL"); + strcat(FileName, "SYSTEM32\\KDCOM.DLL"); Status = WinLdrLoadImage(FileName+strlen("\\ArcName\\"), LoaderBootDriver, &KdComBase); DPRINTM(DPRINT_WINDOWS, "KdCom loaded with status %d at %p\n", Status, KdComBase); - WinLdrAllocateDataTableEntry(LoaderBlock, "kdcom.dll", + Status = WinLdrAllocateDataTableEntry(LoaderBlock, "kdcom.dll", FileName, KdComBase, &KdComDTE); + DPRINTM(DPRINT_WINDOWS, "KdCom Data Table Entry allocated with status %d at %p\n", Status, HalDTE); /* Load all referenced DLLs for kernel, HAL and kdcom.dll */ strcpy(SearchPath, BootPath); WinLdrScanImportDescriptorTable(LoaderBlock, SearchPath, KernelDTE); WinLdrScanImportDescriptorTable(LoaderBlock, SearchPath, HalDTE); + if (KdComDTE) + WinLdrScanImportDescriptorTable(LoaderBlock, SearchPath, KdComDTE); + /* In system32 too */ + strcpy(SearchPath + strlen(BootPath), "system32\\"); + WinLdrScanImportDescriptorTable(LoaderBlock, SearchPath, KernelDTE); + WinLdrScanImportDescriptorTable(LoaderBlock, SearchPath, HalDTE); if (KdComDTE) WinLdrScanImportDescriptorTable(LoaderBlock, SearchPath, KdComDTE); - /* Load NLS data */ - SetupLdrLoadNlsData(LoaderBlock, InfHandle, BootPath); + /* Load NLS data, they are in system32 */ + SetupLdrLoadNlsData(LoaderBlock, InfHandle, SearchPath); /* Get a list of boot drivers */ SetupLdrScanBootDrivers(LoaderBlock, InfHandle, BootPath); diff --git a/dll/3rdparty/dxtn/CMakeLists.txt b/dll/3rdparty/dxtn/CMakeLists.txt index 57497e825f5..c262e1efbe8 100644 --- a/dll/3rdparty/dxtn/CMakeLists.txt +++ b/dll/3rdparty/dxtn/CMakeLists.txt @@ -16,4 +16,4 @@ add_importlibs(dxtn msvcrt) add_dependencies(dxtn psdk) -add_cab_target(dxtn 1) +add_cd_file(TARGET dxtn DESTINATION reactos/system32) diff --git a/dll/3rdparty/libjpeg/CMakeLists.txt b/dll/3rdparty/libjpeg/CMakeLists.txt index 9c074e830fb..646af896d16 100644 --- a/dll/3rdparty/libjpeg/CMakeLists.txt +++ b/dll/3rdparty/libjpeg/CMakeLists.txt @@ -70,4 +70,4 @@ add_importlibs(libjpeg msvcrt kernel32) add_dependencies(libjpeg psdk) -add_cab_target(libjpeg 1) +add_cd_file(TARGET libjpeg DESTINATION reactos/system32) diff --git a/dll/3rdparty/libpng/CMakeLists.txt b/dll/3rdparty/libpng/CMakeLists.txt index 3a17e90deb3..4bd40873dee 100644 --- a/dll/3rdparty/libpng/CMakeLists.txt +++ b/dll/3rdparty/libpng/CMakeLists.txt @@ -36,4 +36,4 @@ add_importlibs(libpng msvcrt kernel32) add_dependencies(libpng psdk) -add_cab_target(libpng 1) +add_cd_file(TARGET libpng DESTINATION reactos/system32) diff --git a/dll/3rdparty/libtiff/CMakeLists.txt b/dll/3rdparty/libtiff/CMakeLists.txt index 0d4da92a6e1..86f79be3d0a 100644 --- a/dll/3rdparty/libtiff/CMakeLists.txt +++ b/dll/3rdparty/libtiff/CMakeLists.txt @@ -59,4 +59,4 @@ add_importlibs(libtiff user32 msvcrt kernel32) add_dependencies(libtiff psdk) -add_cab_target(libtiff 1) +add_cd_file(TARGET libtiff DESTINATION reactos/system32) diff --git a/dll/3rdparty/libxslt/CMakeLists.txt b/dll/3rdparty/libxslt/CMakeLists.txt index 85a0f8fdbed..9fb554cfd6d 100644 --- a/dll/3rdparty/libxslt/CMakeLists.txt +++ b/dll/3rdparty/libxslt/CMakeLists.txt @@ -43,4 +43,4 @@ endif() add_dependencies(libxslt psdk) -add_cab_target(libxslt 1) +add_cd_file(TARGET libxslt DESTINATION reactos/system32) diff --git a/dll/3rdparty/mesa32/CMakeLists.txt b/dll/3rdparty/mesa32/CMakeLists.txt index cd76f199107..7cc558fd2e1 100644 --- a/dll/3rdparty/mesa32/CMakeLists.txt +++ b/dll/3rdparty/mesa32/CMakeLists.txt @@ -269,4 +269,4 @@ add_importlibs(mesa32 gdi32 user32 msvcrt kernel32 ntdll) add_dependencies(mesa32 psdk) -add_cab_target(mesa32 1) +add_cd_file(TARGET mesa32 DESTINATION reactos/system32) diff --git a/dll/cpl/access/CMakeLists.txt b/dll/cpl/access/CMakeLists.txt index b76afa3226d..425b8d37bb9 100644 --- a/dll/cpl/access/CMakeLists.txt +++ b/dll/cpl/access/CMakeLists.txt @@ -24,4 +24,4 @@ add_importlibs(access comctl32 kernel32) -add_cab_target(access 1) +add_cd_file(TARGET access DESTINATION reactos/system32) diff --git a/dll/cpl/appwiz/CMakeLists.txt b/dll/cpl/appwiz/CMakeLists.txt index f7423cff183..9604735be60 100644 --- a/dll/cpl/appwiz/CMakeLists.txt +++ b/dll/cpl/appwiz/CMakeLists.txt @@ -23,4 +23,4 @@ add_importlibs(appwiz shell32 kernel32) -add_cab_target(appwiz 1) +add_cd_file(TARGET appwiz DESTINATION reactos/system32) diff --git a/dll/cpl/console/CMakeLists.txt b/dll/cpl/console/CMakeLists.txt index e498349c804..88e1768f8cc 100644 --- a/dll/cpl/console/CMakeLists.txt +++ b/dll/cpl/console/CMakeLists.txt @@ -24,4 +24,4 @@ add_importlibs(console kernel32) add_pch(console ${CMAKE_CURRENT_SOURCE_DIR}/console.h ${SOURCE}) -add_cab_target(console 1) +add_cd_file(TARGET console DESTINATION reactos/system32) diff --git a/dll/cpl/desk/CMakeLists.txt b/dll/cpl/desk/CMakeLists.txt index a9ae5cbc495..d10c077c641 100644 --- a/dll/cpl/desk/CMakeLists.txt +++ b/dll/cpl/desk/CMakeLists.txt @@ -47,4 +47,4 @@ add_importlibs(desk kernel32 ntdll) -add_cab_target(desk 1) +add_cd_file(TARGET desk DESTINATION reactos/system32) diff --git a/dll/cpl/hdwwiz/CMakeLists.txt b/dll/cpl/hdwwiz/CMakeLists.txt index 8082d0cfd6c..8877b187890 100644 --- a/dll/cpl/hdwwiz/CMakeLists.txt +++ b/dll/cpl/hdwwiz/CMakeLists.txt @@ -20,4 +20,4 @@ add_importlibs(hdwwiz kernel32 ntdll) -add_cab_target(hdwwiz 1) +add_cd_file(TARGET hdwwiz DESTINATION reactos/system32) diff --git a/dll/cpl/input/CMakeLists.txt b/dll/cpl/input/CMakeLists.txt index de8c3f0ba16..a97a16763fd 100644 --- a/dll/cpl/input/CMakeLists.txt +++ b/dll/cpl/input/CMakeLists.txt @@ -23,4 +23,4 @@ add_importlibs(input gdi32 kernel32) -add_cab_target(input 1) +add_cd_file(TARGET input DESTINATION reactos/system32) diff --git a/dll/cpl/intl/CMakeLists.txt b/dll/cpl/intl/CMakeLists.txt index 6aaa0d3d0e6..d1c16e410b6 100644 --- a/dll/cpl/intl/CMakeLists.txt +++ b/dll/cpl/intl/CMakeLists.txt @@ -32,4 +32,4 @@ add_importlibs(intl shell32 kernel32) -add_cab_target(intl 1) +add_cd_file(TARGET intl DESTINATION reactos/system32) diff --git a/dll/cpl/joy/CMakeLists.txt b/dll/cpl/joy/CMakeLists.txt index c08cc5bbeb8..9a674b2b5c1 100644 --- a/dll/cpl/joy/CMakeLists.txt +++ b/dll/cpl/joy/CMakeLists.txt @@ -19,4 +19,4 @@ add_importlibs(joy kernel32 ntdll) -add_cab_target(joy 1) +add_cd_file(TARGET joy DESTINATION reactos/system32) diff --git a/dll/cpl/main/CMakeLists.txt b/dll/cpl/main/CMakeLists.txt index 38eb38e8c55..64c629c0391 100644 --- a/dll/cpl/main/CMakeLists.txt +++ b/dll/cpl/main/CMakeLists.txt @@ -26,4 +26,4 @@ add_importlibs(main gdi32 kernel32) -add_cab_target(main 1) +add_cd_file(TARGET main DESTINATION reactos/system32) diff --git a/dll/cpl/mmsys/CMakeLists.txt b/dll/cpl/mmsys/CMakeLists.txt index 6384bb3fb7d..9a547c79191 100644 --- a/dll/cpl/mmsys/CMakeLists.txt +++ b/dll/cpl/mmsys/CMakeLists.txt @@ -31,4 +31,4 @@ add_importlibs(mmsys ntdll kernel32) -add_cab_target(mmsys 1) +add_cd_file(TARGET mmsys DESTINATION reactos/system32) diff --git a/dll/cpl/ncpa/CMakeLists.txt b/dll/cpl/ncpa/CMakeLists.txt index 66cc15d0cd3..4fc05488a6c 100644 --- a/dll/cpl/ncpa/CMakeLists.txt +++ b/dll/cpl/ncpa/CMakeLists.txt @@ -13,4 +13,4 @@ add_importlibs(ncpa shell32 kernel32) -add_cab_target(ncpa 1) +add_cd_file(TARGET ncpa DESTINATION reactos/system32) diff --git a/dll/cpl/odbccp32/CMakeLists.txt b/dll/cpl/odbccp32/CMakeLists.txt index e5f6fc05c4c..66f0273aee5 100644 --- a/dll/cpl/odbccp32/CMakeLists.txt +++ b/dll/cpl/odbccp32/CMakeLists.txt @@ -8,4 +8,4 @@ add_library(odbccp32i SHARED odbccp32.c odbccp32.rc ${CMAKE_CURRENT_BINARY_DIR}/ set_module_type(odbccp32i cpl) add_importlibs(odbccp32i user32 comctl32 msvcrt kernel32) -add_cab_target(odbccp32i 1) +add_cd_file(TARGET odbccp32i DESTINATION reactos/system32) diff --git a/dll/cpl/powercfg/CMakeLists.txt b/dll/cpl/powercfg/CMakeLists.txt index f6ac3d0b344..c3ceee99e17 100644 --- a/dll/cpl/powercfg/CMakeLists.txt +++ b/dll/cpl/powercfg/CMakeLists.txt @@ -25,4 +25,4 @@ add_importlibs(powercfg kernel32 ntdll) -add_cab_target(powercfg 1) +add_cd_file(TARGET powercfg DESTINATION reactos/system32) diff --git a/dll/cpl/sysdm/CMakeLists.txt b/dll/cpl/sysdm/CMakeLists.txt index 038c94f7194..1874de17d42 100644 --- a/dll/cpl/sysdm/CMakeLists.txt +++ b/dll/cpl/sysdm/CMakeLists.txt @@ -38,4 +38,4 @@ add_importlibs(sysdm ntdll) add_pch(sysdm ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) -add_cab_target(sysdm 1) +add_cd_file(TARGET sysdm DESTINATION reactos/system32) diff --git a/dll/cpl/telephon/CMakeLists.txt b/dll/cpl/telephon/CMakeLists.txt index f321a56e12e..20dcbbfa63f 100644 --- a/dll/cpl/telephon/CMakeLists.txt +++ b/dll/cpl/telephon/CMakeLists.txt @@ -19,4 +19,4 @@ add_importlibs(telephon msvcrt kernel32) -add_cab_target(telephon 1) +add_cd_file(TARGET telephon DESTINATION reactos/system32) diff --git a/dll/cpl/timedate/CMakeLists.txt b/dll/cpl/timedate/CMakeLists.txt index 48eb91ef8bd..835091f1d40 100644 --- a/dll/cpl/timedate/CMakeLists.txt +++ b/dll/cpl/timedate/CMakeLists.txt @@ -27,4 +27,4 @@ add_importlibs(timedate msvcrt kernel32) -add_cab_target(timedate 1) +add_cd_file(TARGET timedate DESTINATION reactos/system32) diff --git a/dll/cpl/usrmgr/CMakeLists.txt b/dll/cpl/usrmgr/CMakeLists.txt index e1728b52c38..f10fb3cbe39 100644 --- a/dll/cpl/usrmgr/CMakeLists.txt +++ b/dll/cpl/usrmgr/CMakeLists.txt @@ -31,4 +31,4 @@ add_importlibs(usrmgr ntdll) -add_cab_target(usrmgr 1) +add_cd_file(TARGET usrmgr DESTINATION reactos/system32) diff --git a/dll/directx/amstream/CMakeLists.txt b/dll/directx/amstream/CMakeLists.txt index cfaaa1e8f4d..58acb8f261e 100644 --- a/dll/directx/amstream/CMakeLists.txt +++ b/dll/directx/amstream/CMakeLists.txt @@ -33,4 +33,4 @@ add_importlibs(amstream ntdll) add_dependencies(amstream dxsdk) -add_cab_target(amstream 1) +add_cd_file(TARGET amstream DESTINATION reactos/system32) diff --git a/dll/directx/d3d8thk/CMakeLists.txt b/dll/directx/d3d8thk/CMakeLists.txt index 3a9544bc030..a087e080aa7 100644 --- a/dll/directx/d3d8thk/CMakeLists.txt +++ b/dll/directx/d3d8thk/CMakeLists.txt @@ -9,4 +9,4 @@ add_importlibs(d3d8thk gdi32) add_dependencies(d3d8thk psdk) -add_cab_target(d3d8thk 1) +add_cd_file(TARGET d3d8thk DESTINATION reactos/system32) diff --git a/dll/directx/devenum/CMakeLists.txt b/dll/directx/devenum/CMakeLists.txt index 2fe436d5919..bdd1cf39fa6 100644 --- a/dll/directx/devenum/CMakeLists.txt +++ b/dll/directx/devenum/CMakeLists.txt @@ -35,4 +35,4 @@ add_importlibs(devenum kernel32 ntdll) -add_cab_target(devenum 1) +add_cd_file(TARGET devenum DESTINATION reactos/system32) diff --git a/dll/directx/dinput/CMakeLists.txt b/dll/directx/dinput/CMakeLists.txt index f61ec37f654..fab0a4da29b 100644 --- a/dll/directx/dinput/CMakeLists.txt +++ b/dll/directx/dinput/CMakeLists.txt @@ -37,5 +37,5 @@ add_importlibs(dinput kernel32 ntdll) -add_cab_target(dinput 1) +add_cd_file(TARGET dinput DESTINATION reactos/system32) add_importlib_target(dinput.spec) diff --git a/dll/directx/dinput8/CMakeLists.txt b/dll/directx/dinput8/CMakeLists.txt index ca384dbc1b5..1dc499b57a3 100644 --- a/dll/directx/dinput8/CMakeLists.txt +++ b/dll/directx/dinput8/CMakeLists.txt @@ -32,5 +32,5 @@ add_importlibs(dinput8 add_dependencies(dinput8 psdk) -add_cab_target(dinput8 1) +add_cd_file(TARGET dinput8 DESTINATION reactos/system32) add_importlib_target(dinput8.spec) diff --git a/dll/directx/dmusic/CMakeLists.txt b/dll/directx/dmusic/CMakeLists.txt index 5eed21cc0ac..4fb1fe7efcb 100644 --- a/dll/directx/dmusic/CMakeLists.txt +++ b/dll/directx/dmusic/CMakeLists.txt @@ -41,4 +41,4 @@ add_importlibs(dmusic add_dependencies(dmusic psdk) -add_cab_target(dmusic 1) +add_cd_file(TARGET dmusic DESTINATION reactos/system32) diff --git a/dll/directx/dplay/CMakeLists.txt b/dll/directx/dplay/CMakeLists.txt index 57b30178dc9..ca8c48ddaf5 100644 --- a/dll/directx/dplay/CMakeLists.txt +++ b/dll/directx/dplay/CMakeLists.txt @@ -27,5 +27,5 @@ add_importlibs(dplay add_dependencies(dplay psdk) -add_cab_target(dplay 1) +add_cd_file(TARGET dplay DESTINATION reactos/system32) add_importlib_target(dplay.spec libdplayx) diff --git a/dll/directx/dplayx/CMakeLists.txt b/dll/directx/dplayx/CMakeLists.txt index 9ee83d44fb2..12877e94b36 100644 --- a/dll/directx/dplayx/CMakeLists.txt +++ b/dll/directx/dplayx/CMakeLists.txt @@ -36,5 +36,5 @@ add_importlibs(dplayx kernel32 ntdll) -add_cab_target(dplayx 1) +add_cd_file(TARGET dplayx DESTINATION reactos/system32) add_importlib_target(dplayx.spec) diff --git a/dll/directx/dsound/CMakeLists.txt b/dll/directx/dsound/CMakeLists.txt index 203b037409d..4de49affbaa 100644 --- a/dll/directx/dsound/CMakeLists.txt +++ b/dll/directx/dsound/CMakeLists.txt @@ -39,5 +39,5 @@ add_importlibs(dsound kernel32 ntdll) -add_cab_target(dsound 1) +add_cd_file(TARGET dsound DESTINATION reactos/system32) add_importlib_target(dsound.spec) diff --git a/dll/directx/dxdiagn/CMakeLists.txt b/dll/directx/dxdiagn/CMakeLists.txt index 1ff42b55880..be676f50107 100644 --- a/dll/directx/dxdiagn/CMakeLists.txt +++ b/dll/directx/dxdiagn/CMakeLists.txt @@ -25,4 +25,4 @@ add_importlibs(dxdiagn kernel32 ntdll) -add_cab_target(dxdiagn 1) +add_cd_file(TARGET dxdiagn DESTINATION reactos/system32) diff --git a/dll/directx/ksproxy/CMakeLists.txt b/dll/directx/ksproxy/CMakeLists.txt index 49db65e8273..d86cb7c6c2b 100644 --- a/dll/directx/ksproxy/CMakeLists.txt +++ b/dll/directx/ksproxy/CMakeLists.txt @@ -52,4 +52,4 @@ add_importlibs(ksproxy add_dependencies(ksproxy psdk) -add_cab_target(ksproxy 1) +add_cd_file(TARGET ksproxy DESTINATION reactos/system32) diff --git a/dll/directx/ksuser/CMakeLists.txt b/dll/directx/ksuser/CMakeLists.txt index b892fac8ddb..8cb90ab0efd 100644 --- a/dll/directx/ksuser/CMakeLists.txt +++ b/dll/directx/ksuser/CMakeLists.txt @@ -7,5 +7,5 @@ set_module_type(ksuser win32dll) add_importlibs(ksuser advapi32 msvcrt kernel32 ntdll) add_dependencies(ksuser psdk bugcodes) -add_cab_target(ksuser 1) +add_cd_file(TARGET ksuser DESTINATION reactos/system32) add_importlib_target(ksuser.spec) diff --git a/dll/directx/msdmo/CMakeLists.txt b/dll/directx/msdmo/CMakeLists.txt index 70413695741..375c320efb9 100644 --- a/dll/directx/msdmo/CMakeLists.txt +++ b/dll/directx/msdmo/CMakeLists.txt @@ -26,4 +26,4 @@ add_importlibs(msdmo add_dependencies(msdmo dxsdk psdk) -add_cab_target(msdmo 1) +add_cd_file(TARGET msdmo DESTINATION reactos/system32) diff --git a/dll/directx/qedit/CMakeLists.txt b/dll/directx/qedit/CMakeLists.txt index ae717b531e1..4da2d3c9893 100644 --- a/dll/directx/qedit/CMakeLists.txt +++ b/dll/directx/qedit/CMakeLists.txt @@ -35,4 +35,4 @@ add_importlibs(qedit ntdll) add_dependencies(qedit dxsdk) -add_cab_target(qedit 1) +add_cd_file(TARGET qedit DESTINATION reactos/system32) diff --git a/dll/directx/quartz/CMakeLists.txt b/dll/directx/quartz/CMakeLists.txt index 66c8e3507e0..1e498afd883 100644 --- a/dll/directx/quartz/CMakeLists.txt +++ b/dll/directx/quartz/CMakeLists.txt @@ -71,4 +71,4 @@ add_importlibs(quartz kernel32 ntdll) -add_cab_target(quartz 1) +add_cd_file(TARGET quartz DESTINATION reactos/system32) diff --git a/dll/directx/wine/d3d8/CMakeLists.txt b/dll/directx/wine/d3d8/CMakeLists.txt index 9d061e41481..d35383a3f57 100644 --- a/dll/directx/wine/d3d8/CMakeLists.txt +++ b/dll/directx/wine/d3d8/CMakeLists.txt @@ -48,4 +48,4 @@ add_importlibs(d3d8 ntdll) add_dependencies(d3d8 wineheaders) -add_cab_target(d3d8 1) +add_cd_file(TARGET d3d8 DESTINATION reactos/system32) diff --git a/dll/directx/wine/d3d9/CMakeLists.txt b/dll/directx/wine/d3d9/CMakeLists.txt index 789b441cede..d0e0c989083 100644 --- a/dll/directx/wine/d3d9/CMakeLists.txt +++ b/dll/directx/wine/d3d9/CMakeLists.txt @@ -51,5 +51,5 @@ add_importlibs(d3d9 ntdll) add_dependencies(d3d9 wineheaders) -add_cab_target(d3d9 1) +add_cd_file(TARGET d3d9 DESTINATION reactos/system32) add_importlib_target(d3d9.spec) diff --git a/dll/directx/wine/d3dx9_24/CMakeLists.txt b/dll/directx/wine/d3dx9_24/CMakeLists.txt index 9b66de1d449..394802b41ca 100644 --- a/dll/directx/wine/d3dx9_24/CMakeLists.txt +++ b/dll/directx/wine/d3dx9_24/CMakeLists.txt @@ -30,5 +30,5 @@ add_importlibs(d3dx9_24 ntdll) add_dependencies(d3dx9_24 wineheaders) -add_cab_target(d3dx9_24 1) +add_cd_file(TARGET d3dx9_24 DESTINATION reactos/system32) add_importlib_target(d3dx9_24.spec libd3dx9_36) diff --git a/dll/directx/wine/d3dx9_25/CMakeLists.txt b/dll/directx/wine/d3dx9_25/CMakeLists.txt index b8daec5b2a0..4d03d78c15d 100644 --- a/dll/directx/wine/d3dx9_25/CMakeLists.txt +++ b/dll/directx/wine/d3dx9_25/CMakeLists.txt @@ -31,5 +31,5 @@ add_importlibs(d3dx9_25 ntdll) add_dependencies(d3dx9_25 wineheaders) -add_cab_target(d3dx9_25 1) +add_cd_file(TARGET d3dx9_25 DESTINATION reactos/system32) add_importlib_target(d3dx9_25.spec libd3dx9_24 libd3dx9_36) diff --git a/dll/directx/wine/d3dx9_26/CMakeLists.txt b/dll/directx/wine/d3dx9_26/CMakeLists.txt index 91c607ee2a6..316508ee0ef 100644 --- a/dll/directx/wine/d3dx9_26/CMakeLists.txt +++ b/dll/directx/wine/d3dx9_26/CMakeLists.txt @@ -31,4 +31,4 @@ add_importlibs(d3dx9_26 ntdll) add_dependencies(d3dx9_26 wineheaders) -add_cab_target(d3dx9_26 1) +add_cd_file(TARGET d3dx9_26 DESTINATION reactos/system32) diff --git a/dll/directx/wine/d3dx9_27/CMakeLists.txt b/dll/directx/wine/d3dx9_27/CMakeLists.txt index b5cdeb7a9c5..cca81417a3d 100644 --- a/dll/directx/wine/d3dx9_27/CMakeLists.txt +++ b/dll/directx/wine/d3dx9_27/CMakeLists.txt @@ -31,4 +31,4 @@ add_importlibs(d3dx9_27 ntdll) add_dependencies(d3dx9_27 wineheaders) -add_cab_target(d3dx9_27 1) +add_cd_file(TARGET d3dx9_27 DESTINATION reactos/system32) diff --git a/dll/directx/wine/d3dx9_28/CMakeLists.txt b/dll/directx/wine/d3dx9_28/CMakeLists.txt index ec679aae287..4109d4d0a22 100644 --- a/dll/directx/wine/d3dx9_28/CMakeLists.txt +++ b/dll/directx/wine/d3dx9_28/CMakeLists.txt @@ -31,4 +31,4 @@ add_importlibs(d3dx9_28 ntdll) add_dependencies(d3dx9_28 wineheaders) -add_cab_target(d3dx9_28 1) +add_cd_file(TARGET d3dx9_28 DESTINATION reactos/system32) diff --git a/dll/directx/wine/d3dx9_29/CMakeLists.txt b/dll/directx/wine/d3dx9_29/CMakeLists.txt index c51f0b021e2..d867c59d5b7 100644 --- a/dll/directx/wine/d3dx9_29/CMakeLists.txt +++ b/dll/directx/wine/d3dx9_29/CMakeLists.txt @@ -31,4 +31,4 @@ add_importlibs(d3dx9_29 ntdll) add_dependencies(d3dx9_29 wineheaders) -add_cab_target(d3dx9_29 1) +add_cd_file(TARGET d3dx9_29 DESTINATION reactos/system32) diff --git a/dll/directx/wine/d3dx9_30/CMakeLists.txt b/dll/directx/wine/d3dx9_30/CMakeLists.txt index d1c271fb705..970e446a6ea 100644 --- a/dll/directx/wine/d3dx9_30/CMakeLists.txt +++ b/dll/directx/wine/d3dx9_30/CMakeLists.txt @@ -31,4 +31,4 @@ add_importlibs(d3dx9_30 ntdll) add_dependencies(d3dx9_30 wineheaders) -add_cab_target(d3dx9_30 1) +add_cd_file(TARGET d3dx9_30 DESTINATION reactos/system32) diff --git a/dll/directx/wine/d3dx9_31/CMakeLists.txt b/dll/directx/wine/d3dx9_31/CMakeLists.txt index 05480aa2c4e..12804e151da 100644 --- a/dll/directx/wine/d3dx9_31/CMakeLists.txt +++ b/dll/directx/wine/d3dx9_31/CMakeLists.txt @@ -30,4 +30,4 @@ add_importlibs(d3dx9_31 ntdll) add_dependencies(d3dx9_31 wineheaders) -add_cab_target(d3dx9_31 1) +add_cd_file(TARGET d3dx9_31 DESTINATION reactos/system32) diff --git a/dll/directx/wine/d3dx9_32/CMakeLists.txt b/dll/directx/wine/d3dx9_32/CMakeLists.txt index a20daaa1a95..2d080ebb5db 100644 --- a/dll/directx/wine/d3dx9_32/CMakeLists.txt +++ b/dll/directx/wine/d3dx9_32/CMakeLists.txt @@ -30,4 +30,4 @@ add_importlibs(d3dx9_32 ntdll) add_dependencies(d3dx9_32 wineheaders) -add_cab_target(d3dx9_32 1) +add_cd_file(TARGET d3dx9_32 DESTINATION reactos/system32) diff --git a/dll/directx/wine/d3dx9_33/CMakeLists.txt b/dll/directx/wine/d3dx9_33/CMakeLists.txt index 8475defcdff..811284ea75c 100644 --- a/dll/directx/wine/d3dx9_33/CMakeLists.txt +++ b/dll/directx/wine/d3dx9_33/CMakeLists.txt @@ -30,4 +30,4 @@ add_importlibs(d3dx9_33 ntdll) add_dependencies(d3dx9_33 wineheaders) -add_cab_target(d3dx9_33 1) +add_cd_file(TARGET d3dx9_33 DESTINATION reactos/system32) diff --git a/dll/directx/wine/d3dx9_34/CMakeLists.txt b/dll/directx/wine/d3dx9_34/CMakeLists.txt index 54a7a70ad79..c9d51ac91f0 100644 --- a/dll/directx/wine/d3dx9_34/CMakeLists.txt +++ b/dll/directx/wine/d3dx9_34/CMakeLists.txt @@ -30,4 +30,4 @@ add_importlibs(d3dx9_34 ntdll) add_dependencies(d3dx9_34 wineheaders) -add_cab_target(d3dx9_34 1) +add_cd_file(TARGET d3dx9_34 DESTINATION reactos/system32) diff --git a/dll/directx/wine/d3dx9_35/CMakeLists.txt b/dll/directx/wine/d3dx9_35/CMakeLists.txt index cb283e7d3ce..4e9792cf638 100644 --- a/dll/directx/wine/d3dx9_35/CMakeLists.txt +++ b/dll/directx/wine/d3dx9_35/CMakeLists.txt @@ -29,4 +29,4 @@ add_importlibs(d3dx9_35 ntdll) add_dependencies(d3dx9_35 wineheaders) -add_cab_target(d3dx9_35 1) +add_cd_file(TARGET d3dx9_35 DESTINATION reactos/system32) diff --git a/dll/directx/wine/d3dx9_36/CMakeLists.txt b/dll/directx/wine/d3dx9_36/CMakeLists.txt index 0ed897701c1..69cd341f0a8 100644 --- a/dll/directx/wine/d3dx9_36/CMakeLists.txt +++ b/dll/directx/wine/d3dx9_36/CMakeLists.txt @@ -38,5 +38,5 @@ add_importlibs(d3dx9_36 ntdll) add_dependencies(d3dx9_36 wineheaders) -add_cab_target(d3dx9_36 1) +add_cd_file(TARGET d3dx9_36 DESTINATION reactos/system32) add_importlib_target(d3dx9_36.spec) diff --git a/dll/directx/wine/d3dx9_37/CMakeLists.txt b/dll/directx/wine/d3dx9_37/CMakeLists.txt index 86b00133fa9..8475ea4411b 100644 --- a/dll/directx/wine/d3dx9_37/CMakeLists.txt +++ b/dll/directx/wine/d3dx9_37/CMakeLists.txt @@ -29,4 +29,4 @@ add_importlibs(d3dx9_37 ntdll) add_dependencies(d3dx9_37 wineheaders) -add_cab_target(d3dx9_37 1) +add_cd_file(TARGET d3dx9_37 DESTINATION reactos/system32) diff --git a/dll/directx/wine/d3dx9_38/CMakeLists.txt b/dll/directx/wine/d3dx9_38/CMakeLists.txt index 0358e8d0203..e544f8bbe63 100644 --- a/dll/directx/wine/d3dx9_38/CMakeLists.txt +++ b/dll/directx/wine/d3dx9_38/CMakeLists.txt @@ -29,4 +29,4 @@ add_importlibs(d3dx9_38 ntdll) add_dependencies(d3dx9_38 wineheaders) -add_cab_target(d3dx9_38 1) +add_cd_file(TARGET d3dx9_38 DESTINATION reactos/system32) diff --git a/dll/directx/wine/d3dx9_39/CMakeLists.txt b/dll/directx/wine/d3dx9_39/CMakeLists.txt index 0f3df34a7d7..65090ab6a18 100644 --- a/dll/directx/wine/d3dx9_39/CMakeLists.txt +++ b/dll/directx/wine/d3dx9_39/CMakeLists.txt @@ -29,4 +29,4 @@ add_importlibs(d3dx9_39 ntdll) add_dependencies(d3dx9_39 wineheaders) -add_cab_target(d3dx9_39 1) +add_cd_file(TARGET d3dx9_39 DESTINATION reactos/system32) diff --git a/dll/directx/wine/d3dx9_40/CMakeLists.txt b/dll/directx/wine/d3dx9_40/CMakeLists.txt index 1522eb34165..91513f13bb8 100644 --- a/dll/directx/wine/d3dx9_40/CMakeLists.txt +++ b/dll/directx/wine/d3dx9_40/CMakeLists.txt @@ -29,4 +29,4 @@ add_importlibs(d3dx9_40 ntdll) add_dependencies(d3dx9_40 wineheaders) -add_cab_target(d3dx9_40 1) +add_cd_file(TARGET d3dx9_40 DESTINATION reactos/system32) diff --git a/dll/directx/wine/d3dx9_41/CMakeLists.txt b/dll/directx/wine/d3dx9_41/CMakeLists.txt index 5e0c94f3826..599199acd94 100644 --- a/dll/directx/wine/d3dx9_41/CMakeLists.txt +++ b/dll/directx/wine/d3dx9_41/CMakeLists.txt @@ -29,4 +29,4 @@ add_importlibs(d3dx9_41 ntdll) add_dependencies(d3dx9_41 wineheaders) -add_cab_target(d3dx9_41 1) +add_cd_file(TARGET d3dx9_41 DESTINATION reactos/system32) diff --git a/dll/directx/wine/d3dx9_42/CMakeLists.txt b/dll/directx/wine/d3dx9_42/CMakeLists.txt index 1d7bda2e183..ace4542b730 100644 --- a/dll/directx/wine/d3dx9_42/CMakeLists.txt +++ b/dll/directx/wine/d3dx9_42/CMakeLists.txt @@ -29,4 +29,4 @@ add_importlibs(d3dx9_42 ntdll) add_dependencies(d3dx9_42 wineheaders) -add_cab_target(d3dx9_42 1) +add_cd_file(TARGET d3dx9_42 DESTINATION reactos/system32) diff --git a/dll/directx/wine/ddraw/CMakeLists.txt b/dll/directx/wine/ddraw/CMakeLists.txt index 361e85caf35..c248b5df3d6 100644 --- a/dll/directx/wine/ddraw/CMakeLists.txt +++ b/dll/directx/wine/ddraw/CMakeLists.txt @@ -54,5 +54,5 @@ add_importlibs(ddraw ntdll) add_dependencies(ddraw wineheaders) -add_cab_target(ddraw 1) +add_cd_file(TARGET ddraw DESTINATION reactos/system32) add_importlib_target(ddraw.spec) diff --git a/dll/directx/wine/wined3d/CMakeLists.txt b/dll/directx/wine/wined3d/CMakeLists.txt index 840c321307a..ee6a8ffdeed 100644 --- a/dll/directx/wine/wined3d/CMakeLists.txt +++ b/dll/directx/wine/wined3d/CMakeLists.txt @@ -74,5 +74,5 @@ add_importlibs(wined3d ntdll) add_dependencies(wined3d wineheaders) -add_cab_target(wined3d 1) +add_cd_file(TARGET wined3d DESTINATION reactos/system32) add_importlib_target(wined3d.spec) diff --git a/dll/keyboard/kbda1/CMakeLists.txt b/dll/keyboard/kbda1/CMakeLists.txt index 7514406a42f..904807761e5 100644 --- a/dll/keyboard/kbda1/CMakeLists.txt +++ b/dll/keyboard/kbda1/CMakeLists.txt @@ -9,4 +9,4 @@ set_entrypoint(kbda1 0) add_dependencies(kbda1 psdk) -add_cab_target(kbda1 1) +add_cd_file(TARGET kbda1 DESTINATION reactos/system32) diff --git a/dll/keyboard/kbda2/CMakeLists.txt b/dll/keyboard/kbda2/CMakeLists.txt index dce4448ae39..230100f1cd7 100644 --- a/dll/keyboard/kbda2/CMakeLists.txt +++ b/dll/keyboard/kbda2/CMakeLists.txt @@ -9,4 +9,4 @@ set_entrypoint(kbda2 0) add_dependencies(kbda2 psdk) -add_cab_target(kbda2 1) +add_cd_file(TARGET kbda2 DESTINATION reactos/system32) diff --git a/dll/keyboard/kbda3/CMakeLists.txt b/dll/keyboard/kbda3/CMakeLists.txt index 0a2cfd2c8f2..b35a9b1edf9 100644 --- a/dll/keyboard/kbda3/CMakeLists.txt +++ b/dll/keyboard/kbda3/CMakeLists.txt @@ -9,4 +9,4 @@ set_entrypoint(kbda3 0) add_dependencies(kbda3 psdk) -add_cab_target(kbda3 1) +add_cd_file(TARGET kbda3 DESTINATION reactos/system32) diff --git a/dll/keyboard/kbdal/CMakeLists.txt b/dll/keyboard/kbdal/CMakeLists.txt index 5d1abef93d4..72b3f9080c8 100644 --- a/dll/keyboard/kbdal/CMakeLists.txt +++ b/dll/keyboard/kbdal/CMakeLists.txt @@ -9,4 +9,4 @@ set_entrypoint(kbdal 0) add_dependencies(kbdal psdk) -add_cab_target(kbdal 1) +add_cd_file(TARGET kbdal DESTINATION reactos/system32) diff --git a/dll/keyboard/kbdarme/CMakeLists.txt b/dll/keyboard/kbdarme/CMakeLists.txt index 60996756c5e..f0e8eae9e38 100644 --- a/dll/keyboard/kbdarme/CMakeLists.txt +++ b/dll/keyboard/kbdarme/CMakeLists.txt @@ -9,4 +9,4 @@ set_entrypoint(kbdarme 0) add_dependencies(kbdarme psdk) -add_cab_target(kbdarme 1) +add_cd_file(TARGET kbdarme DESTINATION reactos/system32) diff --git a/dll/keyboard/kbdarmw/CMakeLists.txt b/dll/keyboard/kbdarmw/CMakeLists.txt index bff4aa37f78..03ce9b7fa86 100644 --- a/dll/keyboard/kbdarmw/CMakeLists.txt +++ b/dll/keyboard/kbdarmw/CMakeLists.txt @@ -9,4 +9,4 @@ set_entrypoint(kbdarmw 0) add_dependencies(kbdarmw psdk) -add_cab_target(kbdarmw 1) +add_cd_file(TARGET kbdarmw DESTINATION reactos/system32) diff --git a/dll/keyboard/kbdaze/CMakeLists.txt b/dll/keyboard/kbdaze/CMakeLists.txt index b7407ac10b7..9af3917aa50 100644 --- a/dll/keyboard/kbdaze/CMakeLists.txt +++ b/dll/keyboard/kbdaze/CMakeLists.txt @@ -9,4 +9,4 @@ set_entrypoint(kbdaze 0) add_dependencies(kbdaze psdk) -add_cab_target(kbdaze 1) +add_cd_file(TARGET kbdaze DESTINATION reactos/system32) diff --git a/dll/keyboard/kbdazel/CMakeLists.txt b/dll/keyboard/kbdazel/CMakeLists.txt index 9a6d149582c..1d4ba41abc2 100644 --- a/dll/keyboard/kbdazel/CMakeLists.txt +++ b/dll/keyboard/kbdazel/CMakeLists.txt @@ -9,4 +9,4 @@ set_entrypoint(kbdazel 0) add_dependencies(kbdazel psdk) -add_cab_target(kbdazel 1) +add_cd_file(TARGET kbdazel DESTINATION reactos/system32) diff --git a/dll/keyboard/kbdbe/CMakeLists.txt b/dll/keyboard/kbdbe/CMakeLists.txt index ffac78d7f48..bad5fa944ec 100644 --- a/dll/keyboard/kbdbe/CMakeLists.txt +++ b/dll/keyboard/kbdbe/CMakeLists.txt @@ -9,4 +9,4 @@ set_entrypoint(kbdbe 0) add_dependencies(kbdbe psdk) -add_cab_target(kbdbe 1) +add_cd_file(TARGET kbdbe DESTINATION reactos/system32) diff --git a/dll/keyboard/kbdbga/CMakeLists.txt b/dll/keyboard/kbdbga/CMakeLists.txt index d881c5ff0e6..256b0fe6cb2 100644 --- a/dll/keyboard/kbdbga/CMakeLists.txt +++ b/dll/keyboard/kbdbga/CMakeLists.txt @@ -9,4 +9,4 @@ set_entrypoint(kbdbga 0) add_dependencies(kbdbga psdk) -add_cab_target(kbdbga 1) +add_cd_file(TARGET kbdbga DESTINATION reactos/system32) diff --git a/dll/keyboard/kbdbgm/CMakeLists.txt b/dll/keyboard/kbdbgm/CMakeLists.txt index c0dfee9b375..dbf73732463 100644 --- a/dll/keyboard/kbdbgm/CMakeLists.txt +++ b/dll/keyboard/kbdbgm/CMakeLists.txt @@ -9,4 +9,4 @@ set_entrypoint(kbdbgm 0) add_dependencies(kbdbgm psdk) -add_cab_target(kbdbgm 1) +add_cd_file(TARGET kbdbgm DESTINATION reactos/system32) diff --git a/dll/keyboard/kbdbgt/CMakeLists.txt b/dll/keyboard/kbdbgt/CMakeLists.txt index 814f52ab3c8..e785f568073 100644 --- a/dll/keyboard/kbdbgt/CMakeLists.txt +++ b/dll/keyboard/kbdbgt/CMakeLists.txt @@ -9,4 +9,4 @@ set_entrypoint(kbdbgt 0) add_dependencies(kbdbgt psdk) -add_cab_target(kbdbgt 1) +add_cd_file(TARGET kbdbgt DESTINATION reactos/system32) diff --git a/dll/keyboard/kbdblr/CMakeLists.txt b/dll/keyboard/kbdblr/CMakeLists.txt index 704c5d8193b..4c314f9dd91 100644 --- a/dll/keyboard/kbdblr/CMakeLists.txt +++ b/dll/keyboard/kbdblr/CMakeLists.txt @@ -9,4 +9,4 @@ set_entrypoint(kbdblr 0) add_dependencies(kbdblr psdk) -add_cab_target(kbdblr 1) +add_cd_file(TARGET kbdblr DESTINATION reactos/system32) diff --git a/dll/keyboard/kbdbr/CMakeLists.txt b/dll/keyboard/kbdbr/CMakeLists.txt index e51d229445b..09864625b6d 100644 --- a/dll/keyboard/kbdbr/CMakeLists.txt +++ b/dll/keyboard/kbdbr/CMakeLists.txt @@ -9,4 +9,4 @@ set_entrypoint(kbdbr 0) add_dependencies(kbdbr psdk) -add_cab_target(kbdbr 1) +add_cd_file(TARGET kbdbr DESTINATION reactos/system32) diff --git a/dll/keyboard/kbdbur/CMakeLists.txt b/dll/keyboard/kbdbur/CMakeLists.txt index 6f42e873932..7e03e043b84 100644 --- a/dll/keyboard/kbdbur/CMakeLists.txt +++ b/dll/keyboard/kbdbur/CMakeLists.txt @@ -9,4 +9,4 @@ set_entrypoint(kbdbur 0) add_dependencies(kbdbur psdk) -add_cab_target(kbdbur 1) +add_cd_file(TARGET kbdbur DESTINATION reactos/system32) diff --git a/dll/keyboard/kbdcan/CMakeLists.txt b/dll/keyboard/kbdcan/CMakeLists.txt index 3f2e43116fc..7ad1d153ad2 100644 --- a/dll/keyboard/kbdcan/CMakeLists.txt +++ b/dll/keyboard/kbdcan/CMakeLists.txt @@ -9,4 +9,4 @@ set_entrypoint(kbdcan 0) add_dependencies(kbdcan psdk) -add_cab_target(kbdcan 1) +add_cd_file(TARGET kbdcan DESTINATION reactos/system32) diff --git a/dll/keyboard/kbdcr/CMakeLists.txt b/dll/keyboard/kbdcr/CMakeLists.txt index 25d4073545b..3bbd9bb08da 100644 --- a/dll/keyboard/kbdcr/CMakeLists.txt +++ b/dll/keyboard/kbdcr/CMakeLists.txt @@ -9,4 +9,4 @@ set_entrypoint(kbdcr 0) add_dependencies(kbdcr psdk) -add_cab_target(kbdcr 1) +add_cd_file(TARGET kbdcr DESTINATION reactos/system32) diff --git a/dll/keyboard/kbdcz/CMakeLists.txt b/dll/keyboard/kbdcz/CMakeLists.txt index 7b1a6425bb6..67409dd13f5 100644 --- a/dll/keyboard/kbdcz/CMakeLists.txt +++ b/dll/keyboard/kbdcz/CMakeLists.txt @@ -9,4 +9,4 @@ set_entrypoint(kbdcz 0) add_dependencies(kbdcz psdk) -add_cab_target(kbdcz 1) +add_cd_file(TARGET kbdcz DESTINATION reactos/system32) diff --git a/dll/keyboard/kbdcz1/CMakeLists.txt b/dll/keyboard/kbdcz1/CMakeLists.txt index 8534f7a24a1..9aff245a88d 100644 --- a/dll/keyboard/kbdcz1/CMakeLists.txt +++ b/dll/keyboard/kbdcz1/CMakeLists.txt @@ -9,4 +9,4 @@ set_entrypoint(kbdcz1 0) add_dependencies(kbdcz1 psdk) -add_cab_target(kbdcz1 1) +add_cd_file(TARGET kbdcz1 DESTINATION reactos/system32) diff --git a/dll/keyboard/kbdda/CMakeLists.txt b/dll/keyboard/kbdda/CMakeLists.txt index 576a649ca18..c1d186a116c 100644 --- a/dll/keyboard/kbdda/CMakeLists.txt +++ b/dll/keyboard/kbdda/CMakeLists.txt @@ -9,4 +9,4 @@ set_entrypoint(kbdda 0) add_dependencies(kbdda psdk) -add_cab_target(kbdda 1) +add_cd_file(TARGET kbdda DESTINATION reactos/system32) diff --git a/dll/keyboard/kbddv/CMakeLists.txt b/dll/keyboard/kbddv/CMakeLists.txt index 73f4300f6ff..5015d4946b9 100644 --- a/dll/keyboard/kbddv/CMakeLists.txt +++ b/dll/keyboard/kbddv/CMakeLists.txt @@ -9,4 +9,4 @@ set_entrypoint(kbddv 0) add_dependencies(kbddv psdk) -add_cab_target(kbddv 1) +add_cd_file(TARGET kbddv DESTINATION reactos/system32) diff --git a/dll/keyboard/kbdes/CMakeLists.txt b/dll/keyboard/kbdes/CMakeLists.txt index 308f3a6318e..d62d0d93a5e 100644 --- a/dll/keyboard/kbdes/CMakeLists.txt +++ b/dll/keyboard/kbdes/CMakeLists.txt @@ -9,4 +9,4 @@ set_entrypoint(kbdes 0) add_dependencies(kbdes psdk) -add_cab_target(kbdes 1) +add_cd_file(TARGET kbdes DESTINATION reactos/system32) diff --git a/dll/keyboard/kbdest/CMakeLists.txt b/dll/keyboard/kbdest/CMakeLists.txt index b770a04adad..3b2d8c71631 100644 --- a/dll/keyboard/kbdest/CMakeLists.txt +++ b/dll/keyboard/kbdest/CMakeLists.txt @@ -9,4 +9,4 @@ set_entrypoint(kbdest 0) add_dependencies(kbdest psdk) -add_cab_target(kbdest 1) +add_cd_file(TARGET kbdest DESTINATION reactos/system32) diff --git a/dll/keyboard/kbdfc/CMakeLists.txt b/dll/keyboard/kbdfc/CMakeLists.txt index c5a7d9225b0..308322433fa 100644 --- a/dll/keyboard/kbdfc/CMakeLists.txt +++ b/dll/keyboard/kbdfc/CMakeLists.txt @@ -9,4 +9,4 @@ set_entrypoint(kbdfc 0) add_dependencies(kbdfc psdk) -add_cab_target(kbdfc 1) +add_cd_file(TARGET kbdfc DESTINATION reactos/system32) diff --git a/dll/keyboard/kbdfi/CMakeLists.txt b/dll/keyboard/kbdfi/CMakeLists.txt index 2ba96585d11..c0414cc53c5 100644 --- a/dll/keyboard/kbdfi/CMakeLists.txt +++ b/dll/keyboard/kbdfi/CMakeLists.txt @@ -9,4 +9,4 @@ set_entrypoint(kbdfi 0) add_dependencies(kbdfi psdk) -add_cab_target(kbdfi 1) +add_cd_file(TARGET kbdfi DESTINATION reactos/system32) diff --git a/dll/keyboard/kbdfr/CMakeLists.txt b/dll/keyboard/kbdfr/CMakeLists.txt index c62571b7819..e0c2abcfce8 100644 --- a/dll/keyboard/kbdfr/CMakeLists.txt +++ b/dll/keyboard/kbdfr/CMakeLists.txt @@ -9,4 +9,4 @@ set_entrypoint(kbdfr 0) add_dependencies(kbdfr psdk) -add_cab_target(kbdfr 1) +add_cd_file(TARGET kbdfr DESTINATION reactos/system32) diff --git a/dll/keyboard/kbdgeo/CMakeLists.txt b/dll/keyboard/kbdgeo/CMakeLists.txt index ef49d0d560e..d4352187a39 100644 --- a/dll/keyboard/kbdgeo/CMakeLists.txt +++ b/dll/keyboard/kbdgeo/CMakeLists.txt @@ -9,4 +9,4 @@ set_entrypoint(kbdgeo 0) add_dependencies(kbdgeo psdk) -add_cab_target(kbdgeo 1) +add_cd_file(TARGET kbdgeo DESTINATION reactos/system32) diff --git a/dll/keyboard/kbdgerg/CMakeLists.txt b/dll/keyboard/kbdgerg/CMakeLists.txt index 538151f10f3..fdaaf657dce 100644 --- a/dll/keyboard/kbdgerg/CMakeLists.txt +++ b/dll/keyboard/kbdgerg/CMakeLists.txt @@ -9,4 +9,4 @@ set_entrypoint(kbdgerg 0) add_dependencies(kbdgerg psdk) -add_cab_target(kbdgerg 1) +add_cd_file(TARGET kbdgerg DESTINATION reactos/system32) diff --git a/dll/keyboard/kbdgneo/CMakeLists.txt b/dll/keyboard/kbdgneo/CMakeLists.txt index 71d540ca030..e917ea45fff 100644 --- a/dll/keyboard/kbdgneo/CMakeLists.txt +++ b/dll/keyboard/kbdgneo/CMakeLists.txt @@ -9,4 +9,4 @@ set_entrypoint(kbdgneo 0) add_dependencies(kbdgneo psdk) -add_cab_target(kbdgneo 1) +add_cd_file(TARGET kbdgneo DESTINATION reactos/system32) diff --git a/dll/keyboard/kbdgr/CMakeLists.txt b/dll/keyboard/kbdgr/CMakeLists.txt index 4b0669ef764..98b8f36c2d8 100644 --- a/dll/keyboard/kbdgr/CMakeLists.txt +++ b/dll/keyboard/kbdgr/CMakeLists.txt @@ -9,4 +9,4 @@ set_entrypoint(kbdgr 0) add_dependencies(kbdgr psdk) -add_cab_target(kbdgr 1) +add_cd_file(TARGET kbdgr DESTINATION reactos/system32) diff --git a/dll/keyboard/kbdgrist/CMakeLists.txt b/dll/keyboard/kbdgrist/CMakeLists.txt index c5b599e6556..5207a128afa 100644 --- a/dll/keyboard/kbdgrist/CMakeLists.txt +++ b/dll/keyboard/kbdgrist/CMakeLists.txt @@ -9,4 +9,4 @@ set_entrypoint(kbdgrist 0) add_dependencies(kbdgrist psdk) -add_cab_target(kbdgrist 1) +add_cd_file(TARGET kbdgrist DESTINATION reactos/system32) diff --git a/dll/keyboard/kbdhe/CMakeLists.txt b/dll/keyboard/kbdhe/CMakeLists.txt index 1b52a60c3e8..e82510c48fa 100644 --- a/dll/keyboard/kbdhe/CMakeLists.txt +++ b/dll/keyboard/kbdhe/CMakeLists.txt @@ -9,4 +9,4 @@ set_entrypoint(kbdhe 0) add_dependencies(kbdhe psdk) -add_cab_target(kbdhe 1) +add_cd_file(TARGET kbdhe DESTINATION reactos/system32) diff --git a/dll/keyboard/kbdheb/CMakeLists.txt b/dll/keyboard/kbdheb/CMakeLists.txt index 9881bb54b1d..58ce4fd34d7 100644 --- a/dll/keyboard/kbdheb/CMakeLists.txt +++ b/dll/keyboard/kbdheb/CMakeLists.txt @@ -9,4 +9,4 @@ set_entrypoint(kbdheb 0) add_dependencies(kbdheb psdk) -add_cab_target(kbdheb 1) +add_cd_file(TARGET kbdheb DESTINATION reactos/system32) diff --git a/dll/keyboard/kbdhu/CMakeLists.txt b/dll/keyboard/kbdhu/CMakeLists.txt index 09b6eb197b6..7a71e4f81e9 100644 --- a/dll/keyboard/kbdhu/CMakeLists.txt +++ b/dll/keyboard/kbdhu/CMakeLists.txt @@ -9,4 +9,4 @@ set_entrypoint(kbdhu 0) add_dependencies(kbdhu psdk) -add_cab_target(kbdhu 1) +add_cd_file(TARGET kbdhu DESTINATION reactos/system32) diff --git a/dll/keyboard/kbdic/CMakeLists.txt b/dll/keyboard/kbdic/CMakeLists.txt index 55c7762ca32..9a3b6f3cd0e 100644 --- a/dll/keyboard/kbdic/CMakeLists.txt +++ b/dll/keyboard/kbdic/CMakeLists.txt @@ -9,4 +9,4 @@ set_entrypoint(kbdic 0) add_dependencies(kbdic psdk) -add_cab_target(kbdic 1) +add_cd_file(TARGET kbdic DESTINATION reactos/system32) diff --git a/dll/keyboard/kbdinasa/CMakeLists.txt b/dll/keyboard/kbdinasa/CMakeLists.txt index 43f337e6cbe..c372baba7aa 100644 --- a/dll/keyboard/kbdinasa/CMakeLists.txt +++ b/dll/keyboard/kbdinasa/CMakeLists.txt @@ -9,4 +9,4 @@ set_entrypoint(kbdinasa 0) add_dependencies(kbdinasa psdk) -add_cab_target(kbdinasa 1) +add_cd_file(TARGET kbdinasa DESTINATION reactos/system32) diff --git a/dll/keyboard/kbdinben/CMakeLists.txt b/dll/keyboard/kbdinben/CMakeLists.txt index 0fdc9c91ddf..6c3bf12a784 100644 --- a/dll/keyboard/kbdinben/CMakeLists.txt +++ b/dll/keyboard/kbdinben/CMakeLists.txt @@ -9,4 +9,4 @@ set_entrypoint(kbdinben 0) add_dependencies(kbdinben psdk) -add_cab_target(kbdinben 1) +add_cd_file(TARGET kbdinben DESTINATION reactos/system32) diff --git a/dll/keyboard/kbdindev/CMakeLists.txt b/dll/keyboard/kbdindev/CMakeLists.txt index b8dade8e8f8..12fa2b5117b 100644 --- a/dll/keyboard/kbdindev/CMakeLists.txt +++ b/dll/keyboard/kbdindev/CMakeLists.txt @@ -9,4 +9,4 @@ set_entrypoint(kbdindev 0) add_dependencies(kbdindev psdk) -add_cab_target(kbdindev 1) +add_cd_file(TARGET kbdindev DESTINATION reactos/system32) diff --git a/dll/keyboard/kbdinguj/CMakeLists.txt b/dll/keyboard/kbdinguj/CMakeLists.txt index 6b5ceba7dfc..060d1415156 100644 --- a/dll/keyboard/kbdinguj/CMakeLists.txt +++ b/dll/keyboard/kbdinguj/CMakeLists.txt @@ -9,4 +9,4 @@ set_entrypoint(kbdinguj 0) add_dependencies(kbdinguj psdk) -add_cab_target(kbdinguj 1) +add_cd_file(TARGET kbdinguj DESTINATION reactos/system32) diff --git a/dll/keyboard/kbdinmal/CMakeLists.txt b/dll/keyboard/kbdinmal/CMakeLists.txt index d0c544d8f62..b0ebe39ede8 100644 --- a/dll/keyboard/kbdinmal/CMakeLists.txt +++ b/dll/keyboard/kbdinmal/CMakeLists.txt @@ -9,4 +9,4 @@ set_entrypoint(kbdinmal 0) add_dependencies(kbdinmal psdk) -add_cab_target(kbdinmal 1) +add_cd_file(TARGET kbdinmal DESTINATION reactos/system32) diff --git a/dll/keyboard/kbdir/CMakeLists.txt b/dll/keyboard/kbdir/CMakeLists.txt index 9a270b475c1..b12bd7cb509 100644 --- a/dll/keyboard/kbdir/CMakeLists.txt +++ b/dll/keyboard/kbdir/CMakeLists.txt @@ -9,4 +9,4 @@ set_entrypoint(kbdir 0) add_dependencies(kbdir psdk) -add_cab_target(kbdir 1) +add_cd_file(TARGET kbdir DESTINATION reactos/system32) diff --git a/dll/keyboard/kbdit/CMakeLists.txt b/dll/keyboard/kbdit/CMakeLists.txt index 19dae284d26..64e6fae33b9 100644 --- a/dll/keyboard/kbdit/CMakeLists.txt +++ b/dll/keyboard/kbdit/CMakeLists.txt @@ -9,4 +9,4 @@ set_entrypoint(kbdit 0) add_dependencies(kbdit psdk) -add_cab_target(kbdit 1) +add_cd_file(TARGET kbdit DESTINATION reactos/system32) diff --git a/dll/keyboard/kbdja/CMakeLists.txt b/dll/keyboard/kbdja/CMakeLists.txt index 05c8f04be96..8a5ccec99f8 100644 --- a/dll/keyboard/kbdja/CMakeLists.txt +++ b/dll/keyboard/kbdja/CMakeLists.txt @@ -9,4 +9,4 @@ set_entrypoint(kbdja 0) add_dependencies(kbdja psdk) -add_cab_target(kbdja 1) +add_cd_file(TARGET kbdja DESTINATION reactos/system32) diff --git a/dll/keyboard/kbdkaz/CMakeLists.txt b/dll/keyboard/kbdkaz/CMakeLists.txt index c9b491f4f02..be53f7533d1 100644 --- a/dll/keyboard/kbdkaz/CMakeLists.txt +++ b/dll/keyboard/kbdkaz/CMakeLists.txt @@ -9,4 +9,4 @@ set_entrypoint(kbdkaz 0) add_dependencies(kbdkaz psdk) -add_cab_target(kbdkaz 1) +add_cd_file(TARGET kbdkaz DESTINATION reactos/system32) diff --git a/dll/keyboard/kbdko/CMakeLists.txt b/dll/keyboard/kbdko/CMakeLists.txt index 4509a1a84e1..0d9c69adea5 100644 --- a/dll/keyboard/kbdko/CMakeLists.txt +++ b/dll/keyboard/kbdko/CMakeLists.txt @@ -9,4 +9,4 @@ set_entrypoint(kbdko 0) add_dependencies(kbdko psdk) -add_cab_target(kbdko 1) +add_cd_file(TARGET kbdko DESTINATION reactos/system32) diff --git a/dll/keyboard/kbdla/CMakeLists.txt b/dll/keyboard/kbdla/CMakeLists.txt index 4956a9a21b3..530886af447 100644 --- a/dll/keyboard/kbdla/CMakeLists.txt +++ b/dll/keyboard/kbdla/CMakeLists.txt @@ -9,4 +9,4 @@ set_entrypoint(kbdla 0) add_dependencies(kbdla psdk) -add_cab_target(kbdla 1) +add_cd_file(TARGET kbdla DESTINATION reactos/system32) diff --git a/dll/keyboard/kbdlt1/CMakeLists.txt b/dll/keyboard/kbdlt1/CMakeLists.txt index 23b2137383e..d2d352f9563 100644 --- a/dll/keyboard/kbdlt1/CMakeLists.txt +++ b/dll/keyboard/kbdlt1/CMakeLists.txt @@ -9,4 +9,4 @@ set_entrypoint(kbdlt1 0) add_dependencies(kbdlt1 psdk) -add_cab_target(kbdlt1 1) +add_cd_file(TARGET kbdlt1 DESTINATION reactos/system32) diff --git a/dll/keyboard/kbdlv/CMakeLists.txt b/dll/keyboard/kbdlv/CMakeLists.txt index 2024d59c04d..a5e244487aa 100644 --- a/dll/keyboard/kbdlv/CMakeLists.txt +++ b/dll/keyboard/kbdlv/CMakeLists.txt @@ -9,4 +9,4 @@ set_entrypoint(kbdlv 0) add_dependencies(kbdlv psdk) -add_cab_target(kbdlv 1) +add_cd_file(TARGET kbdlv DESTINATION reactos/system32) diff --git a/dll/keyboard/kbdmac/CMakeLists.txt b/dll/keyboard/kbdmac/CMakeLists.txt index 48cbb452927..e890ecf8d01 100644 --- a/dll/keyboard/kbdmac/CMakeLists.txt +++ b/dll/keyboard/kbdmac/CMakeLists.txt @@ -9,4 +9,4 @@ set_entrypoint(kbdmac 0) add_dependencies(kbdmac psdk) -add_cab_target(kbdmac 1) +add_cd_file(TARGET kbdmac DESTINATION reactos/system32) diff --git a/dll/keyboard/kbdne/CMakeLists.txt b/dll/keyboard/kbdne/CMakeLists.txt index 2c59d3aeb79..b857dd4d89c 100644 --- a/dll/keyboard/kbdne/CMakeLists.txt +++ b/dll/keyboard/kbdne/CMakeLists.txt @@ -9,4 +9,4 @@ set_entrypoint(kbdne 0) add_dependencies(kbdne psdk) -add_cab_target(kbdne 1) +add_cd_file(TARGET kbdne DESTINATION reactos/system32) diff --git a/dll/keyboard/kbdno/CMakeLists.txt b/dll/keyboard/kbdno/CMakeLists.txt index cd8711923b3..cc73a4b75b7 100644 --- a/dll/keyboard/kbdno/CMakeLists.txt +++ b/dll/keyboard/kbdno/CMakeLists.txt @@ -9,4 +9,4 @@ set_entrypoint(kbdno 0) add_dependencies(kbdno psdk) -add_cab_target(kbdno 1) +add_cd_file(TARGET kbdno DESTINATION reactos/system32) diff --git a/dll/keyboard/kbdpl1/CMakeLists.txt b/dll/keyboard/kbdpl1/CMakeLists.txt index f479f2456d7..47dbd702a24 100644 --- a/dll/keyboard/kbdpl1/CMakeLists.txt +++ b/dll/keyboard/kbdpl1/CMakeLists.txt @@ -9,4 +9,4 @@ set_entrypoint(kbdpl1 0) add_dependencies(kbdpl1 psdk) -add_cab_target(kbdpl1 1) +add_cd_file(TARGET kbdpl1 DESTINATION reactos/system32) diff --git a/dll/keyboard/kbdpo/CMakeLists.txt b/dll/keyboard/kbdpo/CMakeLists.txt index 600cf6e88b9..01595af6230 100644 --- a/dll/keyboard/kbdpo/CMakeLists.txt +++ b/dll/keyboard/kbdpo/CMakeLists.txt @@ -9,4 +9,4 @@ set_entrypoint(kbdpo 0) add_dependencies(kbdpo psdk) -add_cab_target(kbdpo 1) +add_cd_file(TARGET kbdpo DESTINATION reactos/system32) diff --git a/dll/keyboard/kbdro/CMakeLists.txt b/dll/keyboard/kbdro/CMakeLists.txt index a69ec46e3a4..8cc9905070e 100644 --- a/dll/keyboard/kbdro/CMakeLists.txt +++ b/dll/keyboard/kbdro/CMakeLists.txt @@ -9,4 +9,4 @@ set_entrypoint(kbdro 0) add_dependencies(kbdro psdk) -add_cab_target(kbdro 1) +add_cd_file(TARGET kbdro DESTINATION reactos/system32) diff --git a/dll/keyboard/kbdru/CMakeLists.txt b/dll/keyboard/kbdru/CMakeLists.txt index 82eeb39be10..53d59fbd7f1 100644 --- a/dll/keyboard/kbdru/CMakeLists.txt +++ b/dll/keyboard/kbdru/CMakeLists.txt @@ -9,4 +9,4 @@ set_entrypoint(kbdru 0) add_dependencies(kbdru psdk) -add_cab_target(kbdru 1) +add_cd_file(TARGET kbdru DESTINATION reactos/system32) diff --git a/dll/keyboard/kbdru1/CMakeLists.txt b/dll/keyboard/kbdru1/CMakeLists.txt index 330293d8d17..6c636612135 100644 --- a/dll/keyboard/kbdru1/CMakeLists.txt +++ b/dll/keyboard/kbdru1/CMakeLists.txt @@ -9,4 +9,4 @@ set_entrypoint(kbdru1 0) add_dependencies(kbdru1 psdk) -add_cab_target(kbdru1 1) +add_cd_file(TARGET kbdru1 DESTINATION reactos/system32) diff --git a/dll/keyboard/kbdsg/CMakeLists.txt b/dll/keyboard/kbdsg/CMakeLists.txt index ab0232ba1ca..c9011f33abb 100644 --- a/dll/keyboard/kbdsg/CMakeLists.txt +++ b/dll/keyboard/kbdsg/CMakeLists.txt @@ -9,4 +9,4 @@ set_entrypoint(kbdsg 0) add_dependencies(kbdsg psdk) -add_cab_target(kbdsg 1) +add_cd_file(TARGET kbdsg DESTINATION reactos/system32) diff --git a/dll/keyboard/kbdsk/CMakeLists.txt b/dll/keyboard/kbdsk/CMakeLists.txt index 96e0dcc9245..3d8141cf257 100644 --- a/dll/keyboard/kbdsk/CMakeLists.txt +++ b/dll/keyboard/kbdsk/CMakeLists.txt @@ -9,4 +9,4 @@ set_entrypoint(kbdsk 0) add_dependencies(kbdsk psdk) -add_cab_target(kbdsk 1) +add_cd_file(TARGET kbdsk DESTINATION reactos/system32) diff --git a/dll/keyboard/kbdsk1/CMakeLists.txt b/dll/keyboard/kbdsk1/CMakeLists.txt index 458fe834b33..4065838c37a 100644 --- a/dll/keyboard/kbdsk1/CMakeLists.txt +++ b/dll/keyboard/kbdsk1/CMakeLists.txt @@ -9,4 +9,4 @@ set_entrypoint(kbdsk1 0) add_dependencies(kbdsk1 psdk) -add_cab_target(kbdsk1 1) +add_cd_file(TARGET kbdsk1 DESTINATION reactos/system32) diff --git a/dll/keyboard/kbdsw/CMakeLists.txt b/dll/keyboard/kbdsw/CMakeLists.txt index f3cfd32eec2..0c633831f21 100644 --- a/dll/keyboard/kbdsw/CMakeLists.txt +++ b/dll/keyboard/kbdsw/CMakeLists.txt @@ -9,4 +9,4 @@ set_entrypoint(kbdsw 0) add_dependencies(kbdsw psdk) -add_cab_target(kbdsw 1) +add_cd_file(TARGET kbdsw DESTINATION reactos/system32) diff --git a/dll/keyboard/kbdtat/CMakeLists.txt b/dll/keyboard/kbdtat/CMakeLists.txt index d1dd9588d5a..aebb607c665 100644 --- a/dll/keyboard/kbdtat/CMakeLists.txt +++ b/dll/keyboard/kbdtat/CMakeLists.txt @@ -9,4 +9,4 @@ set_entrypoint(kbdtat 0) add_dependencies(kbdtat psdk) -add_cab_target(kbdtat 1) +add_cd_file(TARGET kbdtat DESTINATION reactos/system32) diff --git a/dll/keyboard/kbdth0/CMakeLists.txt b/dll/keyboard/kbdth0/CMakeLists.txt index 80ebeb2991d..8949fc12244 100644 --- a/dll/keyboard/kbdth0/CMakeLists.txt +++ b/dll/keyboard/kbdth0/CMakeLists.txt @@ -9,4 +9,4 @@ set_entrypoint(kbdth0 0) add_dependencies(kbdth0 psdk) -add_cab_target(kbdth0 1) +add_cd_file(TARGET kbdth0 DESTINATION reactos/system32) diff --git a/dll/keyboard/kbdth1/CMakeLists.txt b/dll/keyboard/kbdth1/CMakeLists.txt index 893ecdc19ef..f1b9d0fe680 100644 --- a/dll/keyboard/kbdth1/CMakeLists.txt +++ b/dll/keyboard/kbdth1/CMakeLists.txt @@ -9,4 +9,4 @@ set_entrypoint(kbdth1 0) add_dependencies(kbdth1 psdk) -add_cab_target(kbdth1 1) +add_cd_file(TARGET kbdth1 DESTINATION reactos/system32) diff --git a/dll/keyboard/kbdth2/CMakeLists.txt b/dll/keyboard/kbdth2/CMakeLists.txt index 59a6510efb1..42548bec6bc 100644 --- a/dll/keyboard/kbdth2/CMakeLists.txt +++ b/dll/keyboard/kbdth2/CMakeLists.txt @@ -9,4 +9,4 @@ set_entrypoint(kbdth2 0) add_dependencies(kbdth2 psdk) -add_cab_target(kbdth2 1) +add_cd_file(TARGET kbdth2 DESTINATION reactos/system32) diff --git a/dll/keyboard/kbdth3/CMakeLists.txt b/dll/keyboard/kbdth3/CMakeLists.txt index dd82ec66284..e6bfe9a5055 100644 --- a/dll/keyboard/kbdth3/CMakeLists.txt +++ b/dll/keyboard/kbdth3/CMakeLists.txt @@ -9,4 +9,4 @@ set_entrypoint(kbdth3 0) add_dependencies(kbdth3 psdk) -add_cab_target(kbdth3 1) +add_cd_file(TARGET kbdth3 DESTINATION reactos/system32) diff --git a/dll/keyboard/kbdtuf/CMakeLists.txt b/dll/keyboard/kbdtuf/CMakeLists.txt index dd77769d6e8..d02655aa432 100644 --- a/dll/keyboard/kbdtuf/CMakeLists.txt +++ b/dll/keyboard/kbdtuf/CMakeLists.txt @@ -9,4 +9,4 @@ set_entrypoint(kbdtuf 0) add_dependencies(kbdtuf psdk) -add_cab_target(kbdtuf 1) +add_cd_file(TARGET kbdtuf DESTINATION reactos/system32) diff --git a/dll/keyboard/kbdtuq/CMakeLists.txt b/dll/keyboard/kbdtuq/CMakeLists.txt index fc2fc716b65..03ecea2e027 100644 --- a/dll/keyboard/kbdtuq/CMakeLists.txt +++ b/dll/keyboard/kbdtuq/CMakeLists.txt @@ -9,4 +9,4 @@ set_entrypoint(kbdtuq 0) add_dependencies(kbdtuq psdk) -add_cab_target(kbdtuq 1) +add_cd_file(TARGET kbdtuq DESTINATION reactos/system32) diff --git a/dll/keyboard/kbduk/CMakeLists.txt b/dll/keyboard/kbduk/CMakeLists.txt index d8f254a30e5..fb7579d68e4 100644 --- a/dll/keyboard/kbduk/CMakeLists.txt +++ b/dll/keyboard/kbduk/CMakeLists.txt @@ -9,4 +9,4 @@ set_entrypoint(kbduk 0) add_dependencies(kbduk psdk) -add_cab_target(kbduk 1) +add_cd_file(TARGET kbduk DESTINATION reactos/system32) diff --git a/dll/keyboard/kbdur/CMakeLists.txt b/dll/keyboard/kbdur/CMakeLists.txt index 9128a20895d..72d2a3a6ff1 100644 --- a/dll/keyboard/kbdur/CMakeLists.txt +++ b/dll/keyboard/kbdur/CMakeLists.txt @@ -9,4 +9,4 @@ set_entrypoint(kbdur 0) add_dependencies(kbdur psdk) -add_cab_target(kbdur 1) +add_cd_file(TARGET kbdur DESTINATION reactos/system32) diff --git a/dll/keyboard/kbdurs/CMakeLists.txt b/dll/keyboard/kbdurs/CMakeLists.txt index b6d900dd95f..08558ef3cbd 100644 --- a/dll/keyboard/kbdurs/CMakeLists.txt +++ b/dll/keyboard/kbdurs/CMakeLists.txt @@ -9,4 +9,4 @@ set_entrypoint(kbdurs 0) add_dependencies(kbdurs psdk) -add_cab_target(kbdurs 1) +add_cd_file(TARGET kbdurs DESTINATION reactos/system32) diff --git a/dll/keyboard/kbdus/CMakeLists.txt b/dll/keyboard/kbdus/CMakeLists.txt index 34b746c6d41..7a79b6bc043 100644 --- a/dll/keyboard/kbdus/CMakeLists.txt +++ b/dll/keyboard/kbdus/CMakeLists.txt @@ -8,4 +8,4 @@ set_entrypoint(kbdus 0) add_dependencies(kbdus psdk) -add_cab_target(kbdus 1) +add_cd_file(TARGET kbdus DESTINATION reactos/system32) diff --git a/dll/keyboard/kbdusa/CMakeLists.txt b/dll/keyboard/kbdusa/CMakeLists.txt index 33b1f8ef9f3..c6af4f0780f 100644 --- a/dll/keyboard/kbdusa/CMakeLists.txt +++ b/dll/keyboard/kbdusa/CMakeLists.txt @@ -9,4 +9,4 @@ set_entrypoint(kbdusa 0) add_dependencies(kbdusa psdk) -add_cab_target(kbdusa 1) +add_cd_file(TARGET kbdusa DESTINATION reactos/system32) diff --git a/dll/keyboard/kbdusl/CMakeLists.txt b/dll/keyboard/kbdusl/CMakeLists.txt index 0b594bb8b60..8efdd7e9e2e 100644 --- a/dll/keyboard/kbdusl/CMakeLists.txt +++ b/dll/keyboard/kbdusl/CMakeLists.txt @@ -9,4 +9,4 @@ set_entrypoint(kbdusl 0) add_dependencies(kbdusl psdk) -add_cab_target(kbdusl 1) +add_cd_file(TARGET kbdusl DESTINATION reactos/system32) diff --git a/dll/keyboard/kbdusr/CMakeLists.txt b/dll/keyboard/kbdusr/CMakeLists.txt index 555a4276f64..90a9bfef464 100644 --- a/dll/keyboard/kbdusr/CMakeLists.txt +++ b/dll/keyboard/kbdusr/CMakeLists.txt @@ -9,4 +9,4 @@ set_entrypoint(kbdusr 0) add_dependencies(kbdusr psdk) -add_cab_target(kbdusr 1) +add_cd_file(TARGET kbdusr DESTINATION reactos/system32) diff --git a/dll/keyboard/kbdusx/CMakeLists.txt b/dll/keyboard/kbdusx/CMakeLists.txt index c7cc26a28d4..c6a7a5b3a35 100644 --- a/dll/keyboard/kbdusx/CMakeLists.txt +++ b/dll/keyboard/kbdusx/CMakeLists.txt @@ -9,4 +9,4 @@ set_entrypoint(kbdusx 0) add_dependencies(kbdusx psdk) -add_cab_target(kbdusx 1) +add_cd_file(TARGET kbdusx DESTINATION reactos/system32) diff --git a/dll/keyboard/kbduzb/CMakeLists.txt b/dll/keyboard/kbduzb/CMakeLists.txt index 7487124cb49..908ca10bfce 100644 --- a/dll/keyboard/kbduzb/CMakeLists.txt +++ b/dll/keyboard/kbduzb/CMakeLists.txt @@ -9,4 +9,4 @@ set_entrypoint(kbduzb 0) add_dependencies(kbduzb psdk) -add_cab_target(kbduzb 1) +add_cd_file(TARGET kbduzb DESTINATION reactos/system32) diff --git a/dll/keyboard/kbdvntc/CMakeLists.txt b/dll/keyboard/kbdvntc/CMakeLists.txt index 5ee06e9e026..7efa67ebfdb 100644 --- a/dll/keyboard/kbdvntc/CMakeLists.txt +++ b/dll/keyboard/kbdvntc/CMakeLists.txt @@ -9,4 +9,4 @@ set_entrypoint(kbdvntc 0) add_dependencies(kbdvntc psdk) -add_cab_target(kbdvntc 1) +add_cd_file(TARGET kbdvntc DESTINATION reactos/system32) diff --git a/dll/keyboard/kbdycc/CMakeLists.txt b/dll/keyboard/kbdycc/CMakeLists.txt index ecbfad8f19b..c0f28263ba4 100644 --- a/dll/keyboard/kbdycc/CMakeLists.txt +++ b/dll/keyboard/kbdycc/CMakeLists.txt @@ -9,4 +9,4 @@ set_entrypoint(kbdycc 0) add_dependencies(kbdycc psdk) -add_cab_target(kbdycc 1) +add_cd_file(TARGET kbdycc DESTINATION reactos/system32) diff --git a/dll/keyboard/kbdycl/CMakeLists.txt b/dll/keyboard/kbdycl/CMakeLists.txt index 61687b7eb6c..ac0da16d4e4 100644 --- a/dll/keyboard/kbdycl/CMakeLists.txt +++ b/dll/keyboard/kbdycl/CMakeLists.txt @@ -9,4 +9,4 @@ set_entrypoint(kbdycl 0) add_dependencies(kbdycl psdk) -add_cab_target(kbdycl 1) +add_cd_file(TARGET kbdycl DESTINATION reactos/system32) diff --git a/dll/nls/idndl/CMakeLists.txt b/dll/nls/idndl/CMakeLists.txt index 94435b96e07..3ba5d7b22e8 100644 --- a/dll/nls/idndl/CMakeLists.txt +++ b/dll/nls/idndl/CMakeLists.txt @@ -18,4 +18,4 @@ add_importlibs(idndl kernel32) add_dependencies(idndl psdk) -add_livecd_target(idndl reactos) +add_cd_file(TARGET idndl DESTINATION reactos) diff --git a/dll/ntdll/CMakeLists.txt b/dll/ntdll/CMakeLists.txt index dff520c4a0d..f2027d00035 100644 --- a/dll/ntdll/CMakeLists.txt +++ b/dll/ntdll/CMakeLists.txt @@ -58,6 +58,5 @@ set_image_base(ntdll ${baseaddress_ntdll}) add_pch(ntdll ${CMAKE_CURRENT_SOURCE_DIR}/include/ntdll.h ${SOURCE}) add_dependencies(ntdll ntstatus asm) -add_minicd_target(ntdll reactos/system32 ntdll.dll) -add_cab_target(ntdll 1) +add_cd_file(TARGET ntdll DESTINATION reactos/system32 NO_CAB) add_importlib_target(def/ntdll.spec) diff --git a/dll/shellext/deskadp/CMakeLists.txt b/dll/shellext/deskadp/CMakeLists.txt index dae34eb69f7..d28db159d1f 100644 --- a/dll/shellext/deskadp/CMakeLists.txt +++ b/dll/shellext/deskadp/CMakeLists.txt @@ -26,4 +26,4 @@ add_importlibs(deskadp add_pch(deskadp ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) -add_cab_target(deskadp 1) +add_cd_file(TARGET deskadp DESTINATION reactos/system32) diff --git a/dll/shellext/deskmon/CMakeLists.txt b/dll/shellext/deskmon/CMakeLists.txt index 6b0f6552c61..37a924d2bea 100644 --- a/dll/shellext/deskmon/CMakeLists.txt +++ b/dll/shellext/deskmon/CMakeLists.txt @@ -27,4 +27,4 @@ add_importlibs(deskmon add_pch(deskmon ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) -add_cab_target(deskmon 1) +add_cd_file(TARGET deskmon DESTINATION reactos/system32) diff --git a/dll/shellext/devcpux/CMakeLists.txt b/dll/shellext/devcpux/CMakeLists.txt index 5b63f59fae4..b89c54fed5e 100644 --- a/dll/shellext/devcpux/CMakeLists.txt +++ b/dll/shellext/devcpux/CMakeLists.txt @@ -16,4 +16,4 @@ add_importlibs(devcpux kernel32 ntdll) -add_cab_target(devcpux 1) +add_cd_file(TARGET devcpux DESTINATION reactos/system32) diff --git a/dll/shellext/fontext/CMakeLists.txt b/dll/shellext/fontext/CMakeLists.txt index d7583549ab7..2d1fbf73b92 100644 --- a/dll/shellext/fontext/CMakeLists.txt +++ b/dll/shellext/fontext/CMakeLists.txt @@ -25,4 +25,4 @@ add_importlibs(fontext kernel32 ntdll) -add_cab_target(fontext 1) +add_cd_file(TARGET fontext DESTINATION reactos/system32) diff --git a/dll/shellext/slayer/CMakeLists.txt b/dll/shellext/slayer/CMakeLists.txt index 7ef277be0e1..a5beea5015f 100644 --- a/dll/shellext/slayer/CMakeLists.txt +++ b/dll/shellext/slayer/CMakeLists.txt @@ -27,4 +27,4 @@ add_importlibs(slayer add_pch(slayer ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) -add_cab_target(slayer 1) +add_cd_file(TARGET slayer DESTINATION reactos/system32) diff --git a/dll/win32/acledit/CMakeLists.txt b/dll/win32/acledit/CMakeLists.txt index 87d336c6032..7863e84af6e 100644 --- a/dll/win32/acledit/CMakeLists.txt +++ b/dll/win32/acledit/CMakeLists.txt @@ -13,5 +13,5 @@ add_library(acledit SHARED ${SOURCE}) set_module_type(acledit win32dll) add_importlibs(acledit msvcrt kernel32 ntdll) -add_cab_target(acledit 1) +add_cd_file(TARGET acledit DESTINATION reactos/system32) add_importlib_target(acledit.spec) diff --git a/dll/win32/aclui/CMakeLists.txt b/dll/win32/aclui/CMakeLists.txt index 11955dd6e4f..8d8af78f402 100644 --- a/dll/win32/aclui/CMakeLists.txt +++ b/dll/win32/aclui/CMakeLists.txt @@ -26,4 +26,4 @@ add_importlibs(aclui user32 gdi32 comctl32 ole32 oleaut32 advapi32 uxtheme msvcr add_pch(aclui ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) -add_cab_target(aclui 1) +add_cd_file(TARGET aclui DESTINATION reactos/system32) diff --git a/dll/win32/activeds/CMakeLists.txt b/dll/win32/activeds/CMakeLists.txt index 7fe72e854a8..ffed6353870 100644 --- a/dll/win32/activeds/CMakeLists.txt +++ b/dll/win32/activeds/CMakeLists.txt @@ -18,4 +18,4 @@ target_link_libraries(activeds wine) add_importlibs(activeds msvcrt kernel32 ntdll) -add_cab_target(activeds 1) +add_cd_file(TARGET activeds DESTINATION reactos/system32) diff --git a/dll/win32/actxprxy/CMakeLists.txt b/dll/win32/actxprxy/CMakeLists.txt index a3ebbb895a9..356e692b224 100644 --- a/dll/win32/actxprxy/CMakeLists.txt +++ b/dll/win32/actxprxy/CMakeLists.txt @@ -39,4 +39,4 @@ add_importlibs(actxprxy add_definitions(-DREGISTER_PROXY_DLL -DPROXY_DELEGATION) -add_cab_target(actxprxy 1) +add_cd_file(TARGET actxprxy DESTINATION reactos/system32) diff --git a/dll/win32/advapi32/CMakeLists.txt b/dll/win32/advapi32/CMakeLists.txt index e7e29dbd5d4..067fce0968b 100644 --- a/dll/win32/advapi32/CMakeLists.txt +++ b/dll/win32/advapi32/CMakeLists.txt @@ -61,5 +61,5 @@ target_link_libraries(advapi32 add_importlibs(advapi32 rpcrt4 kernel32 ntdll msvcrt) add_pch(advapi32 ${CMAKE_CURRENT_SOURCE_DIR}/advapi32.h ${SOURCE}) -add_cab_target(advapi32 1) +add_cd_file(TARGET advapi32 DESTINATION reactos/system32) add_importlib_target(advapi32.spec) diff --git a/dll/win32/advpack/CMakeLists.txt b/dll/win32/advpack/CMakeLists.txt index f988c613f23..2b28ffaeb6c 100644 --- a/dll/win32/advpack/CMakeLists.txt +++ b/dll/win32/advpack/CMakeLists.txt @@ -19,4 +19,4 @@ set_module_type(advpack win32dll) target_link_libraries(advpack wine) add_importlibs(advpack ole32 setupapi version advapi32 msvcrt kernel32 ntdll) -add_cab_target(advpack 1) +add_cd_file(TARGET advpack DESTINATION reactos/system32) diff --git a/dll/win32/atl/CMakeLists.txt b/dll/win32/atl/CMakeLists.txt index 459360cd1cd..697643803a0 100644 --- a/dll/win32/atl/CMakeLists.txt +++ b/dll/win32/atl/CMakeLists.txt @@ -40,4 +40,4 @@ add_importlibs(atl add_importlib_target(atl.spec) add_dependencies(atl atl_atliface_header) -add_cab_target(atl 1) +add_cd_file(TARGET atl DESTINATION reactos/system32) diff --git a/dll/win32/authz/CMakeLists.txt b/dll/win32/authz/CMakeLists.txt index 9ed0f104c30..c9582fc836c 100644 --- a/dll/win32/authz/CMakeLists.txt +++ b/dll/win32/authz/CMakeLists.txt @@ -20,4 +20,4 @@ set_module_type(authz win32dll) add_pch(authz ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) add_importlibs(authz advapi32 msvcrt kernel32 ntdll) -add_cab_target(authz 1) +add_cd_file(TARGET authz DESTINATION reactos/system32) diff --git a/dll/win32/avicap32/CMakeLists.txt b/dll/win32/avicap32/CMakeLists.txt index c3fc804c4cf..69a918f839f 100644 --- a/dll/win32/avicap32/CMakeLists.txt +++ b/dll/win32/avicap32/CMakeLists.txt @@ -14,5 +14,5 @@ target_link_libraries(avicap32 wine) add_importlibs(avicap32 advapi32 user32 version msvcrt kernel32 ntdll) -add_cab_target(avicap32 1) +add_cd_file(TARGET avicap32 DESTINATION reactos/system32) add_importlib_target(avicap32.spec) diff --git a/dll/win32/avifil32/CMakeLists.txt b/dll/win32/avifil32/CMakeLists.txt index ef6182ae7cd..37cdb3ac3fa 100644 --- a/dll/win32/avifil32/CMakeLists.txt +++ b/dll/win32/avifil32/CMakeLists.txt @@ -43,4 +43,4 @@ add_importlibs(avifil32 ntdll) add_importlib_target(avifil32.spec) -add_cab_target(avifil32 1) +add_cd_file(TARGET avifil32 DESTINATION reactos/system32) diff --git a/dll/win32/batt/CMakeLists.txt b/dll/win32/batt/CMakeLists.txt index d6965054a47..e2806a805a4 100644 --- a/dll/win32/batt/CMakeLists.txt +++ b/dll/win32/batt/CMakeLists.txt @@ -15,4 +15,4 @@ add_importlib_target(batt.spec) add_importlibs(batt msvcrt kernel32 ntdll) -add_cab_target(batt 1) +add_cd_file(TARGET batt DESTINATION reactos/system32) diff --git a/dll/win32/bcrypt/CMakeLists.txt b/dll/win32/bcrypt/CMakeLists.txt index 3079a7316a6..490f2f08691 100644 --- a/dll/win32/bcrypt/CMakeLists.txt +++ b/dll/win32/bcrypt/CMakeLists.txt @@ -18,4 +18,4 @@ target_link_libraries(bcrypt wine) add_importlibs(bcrypt msvcrt kernel32 ntdll) -add_cab_target(bcrypt 1) +add_cd_file(TARGET bcrypt DESTINATION reactos/system32) diff --git a/dll/win32/beepmidi/CMakeLists.txt b/dll/win32/beepmidi/CMakeLists.txt index 742da7c9ae5..db9852cff4f 100644 --- a/dll/win32/beepmidi/CMakeLists.txt +++ b/dll/win32/beepmidi/CMakeLists.txt @@ -14,4 +14,4 @@ add_importlibs(beepmidi winmm kernel32 ntdll msvcrt) add_importlib_target(beepmidi.spec) add_dependencies(beepmidi psdk) -add_cab_target(beepmidi 1) +add_cd_file(TARGET beepmidi DESTINATION reactos/system32) diff --git a/dll/win32/browseui/CMakeLists.txt b/dll/win32/browseui/CMakeLists.txt index 05c6542a95c..9d62e43cf68 100644 --- a/dll/win32/browseui/CMakeLists.txt +++ b/dll/win32/browseui/CMakeLists.txt @@ -62,4 +62,4 @@ add_importlibs(browseui kernel32 ntdll) -add_cab_target(browseui 1) +add_cd_file(TARGET browseui DESTINATION reactos/system32) diff --git a/dll/win32/cabinet/CMakeLists.txt b/dll/win32/cabinet/CMakeLists.txt index 769d6822948..39a7aeea42a 100644 --- a/dll/win32/cabinet/CMakeLists.txt +++ b/dll/win32/cabinet/CMakeLists.txt @@ -23,4 +23,4 @@ add_importlibs(cabinet kernel32 ntdll) add_importlib_target(cabinet.spec) add_dependencies(cabinet psdk) -add_cab_target(cabinet 1) +add_cd_file(TARGET cabinet DESTINATION reactos/system32) diff --git a/dll/win32/cards/CMakeLists.txt b/dll/win32/cards/CMakeLists.txt index ff0bd904f51..321b349d4fd 100644 --- a/dll/win32/cards/CMakeLists.txt +++ b/dll/win32/cards/CMakeLists.txt @@ -18,4 +18,4 @@ add_library(cards SHARED ${SOURCE}) set_module_type(cards win32dll) add_importlibs(cards user32 gdi32 msvcrt kernel32) add_importlib_target(cards.spec) -add_cab_target(cards 1) +add_cd_file(TARGET cards DESTINATION reactos/system32) diff --git a/dll/win32/cfgmgr32/CMakeLists.txt b/dll/win32/cfgmgr32/CMakeLists.txt index f60790671f7..768a62e0860 100644 --- a/dll/win32/cfgmgr32/CMakeLists.txt +++ b/dll/win32/cfgmgr32/CMakeLists.txt @@ -11,4 +11,4 @@ add_library(cfgmgr32 SHARED ${SOURCE}) set_entrypoint(cfgmgr32 0) add_importlibs(cfgmgr32 setupapi kernel32 ntdll) add_dependencies(cfgmgr32 psdk) -add_cab_target(cfgmgr32 1) +add_cd_file(TARGET cfgmgr32 DESTINATION reactos/system32) diff --git a/dll/win32/clusapi/CMakeLists.txt b/dll/win32/clusapi/CMakeLists.txt index 44bf9c54503..76ab41a7c45 100644 --- a/dll/win32/clusapi/CMakeLists.txt +++ b/dll/win32/clusapi/CMakeLists.txt @@ -19,4 +19,4 @@ target_link_libraries(clusapi wine) add_importlibs(clusapi msvcrt kernel32 ntdll) -add_cab_target(clusapi 1) +add_cd_file(TARGET clusapi DESTINATION reactos/system32) diff --git a/dll/win32/comcat/CMakeLists.txt b/dll/win32/comcat/CMakeLists.txt index d4adb650ef5..ad08a5b7be5 100644 --- a/dll/win32/comcat/CMakeLists.txt +++ b/dll/win32/comcat/CMakeLists.txt @@ -22,4 +22,4 @@ target_link_libraries(comcat uuid wine) add_importlibs(comcat ole32 user32 advapi32 ntdll) add_dependencies(comcat psdk) -add_cab_target(comcat 1) +add_cd_file(TARGET comcat DESTINATION reactos/system32) diff --git a/dll/win32/comctl32/CMakeLists.txt b/dll/win32/comctl32/CMakeLists.txt index e45cc97322d..450b2056185 100644 --- a/dll/win32/comctl32/CMakeLists.txt +++ b/dll/win32/comctl32/CMakeLists.txt @@ -71,5 +71,5 @@ add_importlibs(comctl32 kernel32 ntdll) -add_cab_target(comctl32 1) +add_cd_file(TARGET comctl32 DESTINATION reactos/system32) add_importlib_target(comctl32.spec) diff --git a/dll/win32/comdlg32/CMakeLists.txt b/dll/win32/comdlg32/CMakeLists.txt index 8d31d2d7748..acd43aa8f93 100644 --- a/dll/win32/comdlg32/CMakeLists.txt +++ b/dll/win32/comdlg32/CMakeLists.txt @@ -42,5 +42,5 @@ add_importlibs(comdlg32 kernel32 ntdll) -add_cab_target(comdlg32 1) +add_cd_file(TARGET comdlg32 DESTINATION reactos/system32) add_importlib_target(comdlg32.spec) diff --git a/dll/win32/compstui/CMakeLists.txt b/dll/win32/compstui/CMakeLists.txt index ed89e613ebd..571149282c8 100644 --- a/dll/win32/compstui/CMakeLists.txt +++ b/dll/win32/compstui/CMakeLists.txt @@ -16,5 +16,5 @@ set_module_type(compstui win32dll) target_link_libraries(compstui wine) add_importlibs(compstui msvcrt kernel32 ntdll) -add_cab_target(compstui 1) +add_cd_file(TARGET compstui DESTINATION reactos/system32) add_importlib_target(compstui.spec) diff --git a/dll/win32/credui/CMakeLists.txt b/dll/win32/credui/CMakeLists.txt index 92dfdb7134d..18143885e30 100644 --- a/dll/win32/credui/CMakeLists.txt +++ b/dll/win32/credui/CMakeLists.txt @@ -21,4 +21,4 @@ target_link_libraries(credui wine) add_importlibs(credui advapi32 user32 comctl32 msvcrt kernel32 ntdll) add_importlib_target(credui.spec) -add_cab_target(credui 1) +add_cd_file(TARGET credui DESTINATION reactos/system32) diff --git a/dll/win32/crtdll/CMakeLists.txt b/dll/win32/crtdll/CMakeLists.txt index f5f345c1b7b..9f184c20c58 100644 --- a/dll/win32/crtdll/CMakeLists.txt +++ b/dll/win32/crtdll/CMakeLists.txt @@ -32,4 +32,4 @@ target_link_libraries(crtdll add_importlibs(crtdll kernel32 ntdll) add_pch(crtdll ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) -add_cab_target(crtdll 1) +add_cd_file(TARGET crtdll DESTINATION reactos/system32) diff --git a/dll/win32/crypt32/CMakeLists.txt b/dll/win32/crypt32/CMakeLists.txt index 18c8f458417..5240252b409 100644 --- a/dll/win32/crypt32/CMakeLists.txt +++ b/dll/win32/crypt32/CMakeLists.txt @@ -55,5 +55,5 @@ target_link_libraries(crypt32 add_importlibs(crypt32 user32 advapi32 msvcrt kernel32 ntdll) -add_cab_target(crypt32 1) +add_cd_file(TARGET crypt32 DESTINATION reactos/system32) add_importlib_target(crypt32.spec) diff --git a/dll/win32/cryptdlg/CMakeLists.txt b/dll/win32/cryptdlg/CMakeLists.txt index fe8f32b9ee5..7e8d6d81ddc 100644 --- a/dll/win32/cryptdlg/CMakeLists.txt +++ b/dll/win32/cryptdlg/CMakeLists.txt @@ -28,4 +28,4 @@ add_importlibs(cryptdlg kernel32 ntdll) -add_cab_target(cryptdlg 1) +add_cd_file(TARGET cryptdlg DESTINATION reactos/system32) diff --git a/dll/win32/cryptdll/CMakeLists.txt b/dll/win32/cryptdll/CMakeLists.txt index bf100e582c5..ba6c7774b9e 100644 --- a/dll/win32/cryptdll/CMakeLists.txt +++ b/dll/win32/cryptdll/CMakeLists.txt @@ -15,4 +15,4 @@ add_library(cryptdll SHARED ${SOURCE}) set_module_type(cryptdll win32dll) target_link_libraries(cryptdll wine) add_importlibs(cryptdll advapi32 msvcrt kernel32 ntdll) -add_cab_target(cryptdll 1) +add_cd_file(TARGET cryptdll DESTINATION reactos/system32) diff --git a/dll/win32/cryptnet/CMakeLists.txt b/dll/win32/cryptnet/CMakeLists.txt index 79ba8dd3a8f..954707547e8 100644 --- a/dll/win32/cryptnet/CMakeLists.txt +++ b/dll/win32/cryptnet/CMakeLists.txt @@ -23,4 +23,4 @@ add_importlibs(cryptnet ntdll) add_importlib_target(cryptnet.spec) -add_cab_target(cryptnet 1) +add_cd_file(TARGET cryptnet DESTINATION reactos/system32) diff --git a/dll/win32/cryptui/CMakeLists.txt b/dll/win32/cryptui/CMakeLists.txt index 07cc7f8d19c..1e0580533c7 100644 --- a/dll/win32/cryptui/CMakeLists.txt +++ b/dll/win32/cryptui/CMakeLists.txt @@ -36,4 +36,4 @@ add_importlibs(cryptui ntdll) add_importlib_target(cryptui.spec) -add_cab_target(cryptui 1) +add_cd_file(TARGET cryptui DESTINATION reactos/system32) diff --git a/dll/win32/dbghelp/CMakeLists.txt b/dll/win32/dbghelp/CMakeLists.txt index ffb43a4eb64..4e2af29465c 100644 --- a/dll/win32/dbghelp/CMakeLists.txt +++ b/dll/win32/dbghelp/CMakeLists.txt @@ -57,4 +57,4 @@ target_link_libraries(dbghelp add_importlibs(dbghelp psapi version msvcrt kernel32 ntdll) add_importlib_target(dbghelp.spec) -add_cab_target(dbghelp 1) +add_cd_file(TARGET dbghelp DESTINATION reactos/system32) diff --git a/dll/win32/dciman32/CMakeLists.txt b/dll/win32/dciman32/CMakeLists.txt index 9af2a57a5f3..ef82b0bc611 100644 --- a/dll/win32/dciman32/CMakeLists.txt +++ b/dll/win32/dciman32/CMakeLists.txt @@ -17,4 +17,4 @@ add_library(dciman32 SHARED ${SOURCE}) set_module_type(dciman32 win32dll) target_link_libraries(dciman32 wine) add_importlibs(dciman32 msvcrt kernel32 ntdll) -add_cab_target(dciman32 1) +add_cd_file(TARGET dciman32 DESTINATION reactos/system32) diff --git a/dll/win32/devmgr/CMakeLists.txt b/dll/win32/devmgr/CMakeLists.txt index 6feb5bfca9d..a51b6e51392 100644 --- a/dll/win32/devmgr/CMakeLists.txt +++ b/dll/win32/devmgr/CMakeLists.txt @@ -31,5 +31,5 @@ add_importlibs(devmgr add_pch(devmgr ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) -add_cab_target(devmgr 1) +add_cd_file(TARGET devmgr DESTINATION reactos/system32) add_importlib_target(devmgr.spec) diff --git a/dll/win32/dhcpcsvc/CMakeLists.txt b/dll/win32/dhcpcsvc/CMakeLists.txt index a76c067bcd9..4711a5b1983 100644 --- a/dll/win32/dhcpcsvc/CMakeLists.txt +++ b/dll/win32/dhcpcsvc/CMakeLists.txt @@ -34,4 +34,4 @@ add_importlib_target(dhcpcsvc.spec) add_pch(dhcpcsvc ${CMAKE_CURRENT_SOURCE_DIR}/include/rosdhcp.h ${SOURCE}) -add_cab_target(dhcpcsvc 1) +add_cd_file(TARGET dhcpcsvc DESTINATION reactos/system32) diff --git a/dll/win32/dnsapi/CMakeLists.txt b/dll/win32/dnsapi/CMakeLists.txt index 437a781c91e..e48527f0de8 100644 --- a/dll/win32/dnsapi/CMakeLists.txt +++ b/dll/win32/dnsapi/CMakeLists.txt @@ -35,5 +35,5 @@ endif() add_importlibs(dnsapi user32 ws2_32 iphlpapi msvcrt kernel32 ntdll) add_pch(dnsapi ${CMAKE_CURRENT_SOURCE_DIR}/dnsapi/precomp.h ${SOURCE}) add_dependencies(dnsapi psdk) -add_cab_target(dnsapi 1) +add_cd_file(TARGET dnsapi DESTINATION reactos/system32) add_importlib_target(dnsapi.spec) diff --git a/dll/win32/dwmapi/CMakeLists.txt b/dll/win32/dwmapi/CMakeLists.txt index 5623a82a6f1..34ffe4c08ab 100644 --- a/dll/win32/dwmapi/CMakeLists.txt +++ b/dll/win32/dwmapi/CMakeLists.txt @@ -18,4 +18,4 @@ add_library(dwmapi SHARED ${SOURCE}) set_module_type(dwmapi win32dll) target_link_libraries(dwmapi wine) add_importlibs(dwmapi msvcrt kernel32 ntdll) -add_cab_target(dwmapi 1) +add_cd_file(TARGET dwmapi DESTINATION reactos/system32) diff --git a/dll/win32/faultrep/CMakeLists.txt b/dll/win32/faultrep/CMakeLists.txt index b1f8499a666..38b914e2be4 100644 --- a/dll/win32/faultrep/CMakeLists.txt +++ b/dll/win32/faultrep/CMakeLists.txt @@ -17,4 +17,4 @@ add_library(faultrep SHARED ${SOURCE}) set_module_type(faultrep win32dll) target_link_libraries(faultrep wine) add_importlibs(faultrep advapi32 msvcrt kernel32 ntdll) -add_cab_target(faultrep 1) +add_cd_file(TARGET faultrep DESTINATION reactos/system32) diff --git a/dll/win32/fmifs/CMakeLists.txt b/dll/win32/fmifs/CMakeLists.txt index d54ef13ea65..c15165f724c 100644 --- a/dll/win32/fmifs/CMakeLists.txt +++ b/dll/win32/fmifs/CMakeLists.txt @@ -21,5 +21,5 @@ set_entrypoint(fmifs InitializeFmIfs@12) add_importlibs(fmifs kernel32 ntdll) add_dependencies(fmifs psdk) -add_cab_target(fmifs 1) +add_cd_file(TARGET fmifs DESTINATION reactos/system32) add_importlib_target(fmifs.spec) diff --git a/dll/win32/fusion/CMakeLists.txt b/dll/win32/fusion/CMakeLists.txt index 6d995a51e76..4cfe41f80ca 100644 --- a/dll/win32/fusion/CMakeLists.txt +++ b/dll/win32/fusion/CMakeLists.txt @@ -22,4 +22,4 @@ add_library(fusion SHARED ${SOURCE}) set_module_type(fusion win32dll) target_link_libraries(fusion wine uuid) add_importlibs(fusion shlwapi advapi32 dbghelp user32 msvcrt kernel32 ntdll) -add_cab_target(fusion 1) +add_cd_file(TARGET fusion DESTINATION reactos/system32) diff --git a/dll/win32/gdi32/CMakeLists.txt b/dll/win32/gdi32/CMakeLists.txt index d5409c672ab..0b6bd3e186e 100644 --- a/dll/win32/gdi32/CMakeLists.txt +++ b/dll/win32/gdi32/CMakeLists.txt @@ -60,5 +60,5 @@ target_link_libraries(gdi32 add_importlibs(gdi32 user32 advapi32 msvcrt kernel32 ntdll) add_pch(gdi32 ${CMAKE_CURRENT_SOURCE_DIR}/include/precomp.h ${SOURCE}) -add_cab_target(gdi32 1) +add_cd_file(TARGET gdi32 DESTINATION reactos/system32) add_importlib_target(gdi32.spec) diff --git a/dll/win32/gdiplus/CMakeLists.txt b/dll/win32/gdiplus/CMakeLists.txt index 339345da0a9..98e18863d05 100644 --- a/dll/win32/gdiplus/CMakeLists.txt +++ b/dll/win32/gdiplus/CMakeLists.txt @@ -51,4 +51,4 @@ if(ARCH MATCHES amd64) target_link_libraries(gdiplus crt) endif(ARCH MATCHES amd64) -add_cab_target(gdiplus 1) +add_cd_file(TARGET gdiplus DESTINATION reactos/system32) diff --git a/dll/win32/getuname/CMakeLists.txt b/dll/win32/getuname/CMakeLists.txt index 17b0539f533..3a31c69c91e 100644 --- a/dll/win32/getuname/CMakeLists.txt +++ b/dll/win32/getuname/CMakeLists.txt @@ -13,4 +13,4 @@ add_library(getuname SHARED add_importlib_target(getuname.spec) set_module_type(getuname win32dll) add_importlibs(getuname msvcrt kernel32 ntdll) -add_cab_target(getuname 1) +add_cd_file(TARGET getuname DESTINATION reactos/system32) diff --git a/dll/win32/glu32/CMakeLists.txt b/dll/win32/glu32/CMakeLists.txt index 8354edae60e..a15a66a03f2 100644 --- a/dll/win32/glu32/CMakeLists.txt +++ b/dll/win32/glu32/CMakeLists.txt @@ -120,5 +120,5 @@ add_importlibs(glu32 kernel32 ntdll) -add_cab_target(glu32 1) +add_cd_file(TARGET glu32 DESTINATION reactos/system32) add_importlib_target(glu32.spec) diff --git a/dll/win32/hhctrl.ocx/CMakeLists.txt b/dll/win32/hhctrl.ocx/CMakeLists.txt index 7c1d697e676..ed5de5a0e8f 100644 --- a/dll/win32/hhctrl.ocx/CMakeLists.txt +++ b/dll/win32/hhctrl.ocx/CMakeLists.txt @@ -38,4 +38,4 @@ add_importlibs(hhctrl kernel32 ntdll) -add_cab_target(hhctrl 1) +add_cd_file(TARGET hhctrl DESTINATION reactos/system32) diff --git a/dll/win32/hid/CMakeLists.txt b/dll/win32/hid/CMakeLists.txt index 8a22b0a86a7..09b193db70a 100644 --- a/dll/win32/hid/CMakeLists.txt +++ b/dll/win32/hid/CMakeLists.txt @@ -17,4 +17,4 @@ set_module_type(hid win32dll) add_importlibs(hid msvcrt kernel32 ntdll) add_pch(hid ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) -add_cab_target(hid 1) +add_cd_file(TARGET hid DESTINATION reactos/system32) diff --git a/dll/win32/hlink/CMakeLists.txt b/dll/win32/hlink/CMakeLists.txt index e3d8d3f1b4d..065967e58e9 100644 --- a/dll/win32/hlink/CMakeLists.txt +++ b/dll/win32/hlink/CMakeLists.txt @@ -28,4 +28,4 @@ add_importlibs(hlink ntdll) add_importlib_target(hlink.spec) -add_cab_target(hlink 1) +add_cd_file(TARGET hlink DESTINATION reactos/system32) diff --git a/dll/win32/hnetcfg/CMakeLists.txt b/dll/win32/hnetcfg/CMakeLists.txt index 0be671c5b71..2a65458c1ed 100644 --- a/dll/win32/hnetcfg/CMakeLists.txt +++ b/dll/win32/hnetcfg/CMakeLists.txt @@ -32,4 +32,4 @@ add_importlibs(hnetcfg kernel32 ntdll) -add_cab_target(hnetcfg 1) +add_cd_file(TARGET hnetcfg DESTINATION reactos/system32) diff --git a/dll/win32/httpapi/CMakeLists.txt b/dll/win32/httpapi/CMakeLists.txt index c9c51a059ca..ee8ff65527a 100644 --- a/dll/win32/httpapi/CMakeLists.txt +++ b/dll/win32/httpapi/CMakeLists.txt @@ -15,4 +15,4 @@ add_library(httpapi SHARED ${SOURCE}) set_module_type(httpapi win32dll) target_link_libraries(httpapi wine) add_importlibs(httpapi msvcrt kernel32 ntdll) -add_cab_target(httpapi 1) +add_cd_file(TARGET httpapi DESTINATION reactos/system32) diff --git a/dll/win32/iccvid/CMakeLists.txt b/dll/win32/iccvid/CMakeLists.txt index f8f73e520aa..845f93821ad 100644 --- a/dll/win32/iccvid/CMakeLists.txt +++ b/dll/win32/iccvid/CMakeLists.txt @@ -17,4 +17,4 @@ add_library(iccvid SHARED ${SOURCE}) set_module_type(iccvid win32dll) target_link_libraries(iccvid wine) add_importlibs(iccvid user32 msvcrt kernel32 ntdll) -add_cab_target(iccvid 1) +add_cd_file(TARGET iccvid DESTINATION reactos/system32) diff --git a/dll/win32/icmp/CMakeLists.txt b/dll/win32/icmp/CMakeLists.txt index 1ddcd636617..cd940ba541e 100644 --- a/dll/win32/icmp/CMakeLists.txt +++ b/dll/win32/icmp/CMakeLists.txt @@ -18,4 +18,4 @@ set_module_type(icmp win32dll) target_link_libraries(icmp wine) add_importlibs(icmp ws2_32 msvcrt kernel32 ntdll) add_importlib_target(icmp.spec) -add_cab_target(icmp 1) +add_cd_file(TARGET icmp DESTINATION reactos/system32) diff --git a/dll/win32/imaadp32.acm/CMakeLists.txt b/dll/win32/imaadp32.acm/CMakeLists.txt index 3679cae46cb..1be89a3086b 100644 --- a/dll/win32/imaadp32.acm/CMakeLists.txt +++ b/dll/win32/imaadp32.acm/CMakeLists.txt @@ -20,4 +20,4 @@ target_link_libraries(imaadp32.acm wine) add_importlibs(imaadp32.acm winmm user32 msvcrt kernel32 ntdll) add_dependencies(imaadp32.acm psdk) -add_cab_target(imaadp32.acm 1) +add_cd_file(TARGET imaadp32.acm DESTINATION reactos/system32) diff --git a/dll/win32/imagehlp/CMakeLists.txt b/dll/win32/imagehlp/CMakeLists.txt index a303c3ae569..52aa1fb4902 100644 --- a/dll/win32/imagehlp/CMakeLists.txt +++ b/dll/win32/imagehlp/CMakeLists.txt @@ -29,4 +29,4 @@ add_importlib_target(imagehlp.spec) add_pch(imagehlp ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) -add_cab_target(imagehlp 1) +add_cd_file(TARGET imagehlp DESTINATION reactos/system32) diff --git a/dll/win32/imm32/CMakeLists.txt b/dll/win32/imm32/CMakeLists.txt index d4a3e79e054..5e9cf2d72bf 100644 --- a/dll/win32/imm32/CMakeLists.txt +++ b/dll/win32/imm32/CMakeLists.txt @@ -25,5 +25,5 @@ add_library(imm32 SHARED ${SOURCE}) set_module_type(imm32 win32dll) target_link_libraries(imm32 wine) add_importlibs(imm32 advapi32 user32 msvcrt kernel32 ntdll) -add_cab_target(imm32 1) +add_cd_file(TARGET imm32 DESTINATION reactos/system32) add_importlib_target(imm32.spec) diff --git a/dll/win32/inetcomm/CMakeLists.txt b/dll/win32/inetcomm/CMakeLists.txt index 20b0af6c97d..3243d28511d 100644 --- a/dll/win32/inetcomm/CMakeLists.txt +++ b/dll/win32/inetcomm/CMakeLists.txt @@ -37,4 +37,4 @@ add_importlibs(inetcomm ntdll) add_importlib_target(inetcomm.spec) -add_cab_target(inetcomm 1) +add_cd_file(TARGET inetcomm DESTINATION reactos/system32) diff --git a/dll/win32/inetmib1/CMakeLists.txt b/dll/win32/inetmib1/CMakeLists.txt index bd7a6732a6b..7138cf5b908 100644 --- a/dll/win32/inetmib1/CMakeLists.txt +++ b/dll/win32/inetmib1/CMakeLists.txt @@ -25,4 +25,4 @@ add_importlibs(inetmib1 kernel32 ntdll) -add_cab_target(inetmib1 1) +add_cd_file(TARGET inetmib1 DESTINATION reactos/system32) diff --git a/dll/win32/initpki/CMakeLists.txt b/dll/win32/initpki/CMakeLists.txt index 4b629eba47e..640abd8b228 100644 --- a/dll/win32/initpki/CMakeLists.txt +++ b/dll/win32/initpki/CMakeLists.txt @@ -15,4 +15,4 @@ add_library(initpki SHARED ${SOURCE}) set_module_type(initpki win32dll) target_link_libraries(initpki wine) add_importlibs(initpki msvcrt kernel32 ntdll) -add_cab_target(initpki 1) +add_cd_file(TARGET initpki DESTINATION reactos/system32) diff --git a/dll/win32/inseng/CMakeLists.txt b/dll/win32/inseng/CMakeLists.txt index 757f87284da..f36bf708020 100644 --- a/dll/win32/inseng/CMakeLists.txt +++ b/dll/win32/inseng/CMakeLists.txt @@ -27,4 +27,4 @@ add_importlibs(inseng kernel32 ntdll) -add_cab_target(inseng 1) +add_cd_file(TARGET inseng DESTINATION reactos/system32) diff --git a/dll/win32/iphlpapi/CMakeLists.txt b/dll/win32/iphlpapi/CMakeLists.txt index e9293a5591b..268a223ae60 100644 --- a/dll/win32/iphlpapi/CMakeLists.txt +++ b/dll/win32/iphlpapi/CMakeLists.txt @@ -29,5 +29,5 @@ set_module_type(iphlpapi win32dll) target_link_libraries(iphlpapi wine tdilib) add_importlibs(iphlpapi dhcpcsvc advapi32 ws2_32 msvcrt kernel32 ntdll) -add_cab_target(iphlpapi 1) +add_cd_file(TARGET iphlpapi DESTINATION reactos/system32) add_importlib_target(iphlpapi.spec) diff --git a/dll/win32/itircl/CMakeLists.txt b/dll/win32/itircl/CMakeLists.txt index c620b47d26b..6248887ae13 100644 --- a/dll/win32/itircl/CMakeLists.txt +++ b/dll/win32/itircl/CMakeLists.txt @@ -17,4 +17,4 @@ target_link_libraries(itircl wine) add_importlibs(itircl msvcrt kernel32 ntdll) add_dependencies(itircl psdk) -add_cab_target(itircl 1) +add_cd_file(TARGET itircl DESTINATION reactos/system32) diff --git a/dll/win32/itss/CMakeLists.txt b/dll/win32/itss/CMakeLists.txt index ebbd5fc470f..41ae951c2ac 100644 --- a/dll/win32/itss/CMakeLists.txt +++ b/dll/win32/itss/CMakeLists.txt @@ -36,4 +36,4 @@ add_importlibs(itss ntdll) add_dependencies(itss wineheaders) -add_cab_target(itss 1) +add_cd_file(TARGET itss DESTINATION reactos/system32) diff --git a/dll/win32/jscript/CMakeLists.txt b/dll/win32/jscript/CMakeLists.txt index b4e56d0e70b..881c2cc0147 100644 --- a/dll/win32/jscript/CMakeLists.txt +++ b/dll/win32/jscript/CMakeLists.txt @@ -61,4 +61,4 @@ add_importlibs(jscript ntdll) add_dependencies(jscript jsglobal) -add_cab_target(jscript 1) +add_cd_file(TARGET jscript DESTINATION reactos/system32) diff --git a/dll/win32/kernel32/CMakeLists.txt b/dll/win32/kernel32/CMakeLists.txt index e2c8cc7f4e5..eb9c1f31277 100644 --- a/dll/win32/kernel32/CMakeLists.txt +++ b/dll/win32/kernel32/CMakeLists.txt @@ -121,5 +121,5 @@ target_link_libraries(kernel32 ${PSEH_LIB}) add_importlibs(kernel32 ntdll) add_pch(kernel32 ${CMAKE_CURRENT_SOURCE_DIR}/k32.h ${SOURCE}) add_dependencies(kernel32 psdk errcodes asm) -add_cab_target(kernel32 1) +add_cd_file(TARGET kernel32 DESTINATION reactos/system32) add_importlib_target(kernel32.spec) diff --git a/dll/win32/loadperf/CMakeLists.txt b/dll/win32/loadperf/CMakeLists.txt index d3e547c4042..29fcbe3735f 100644 --- a/dll/win32/loadperf/CMakeLists.txt +++ b/dll/win32/loadperf/CMakeLists.txt @@ -12,5 +12,5 @@ add_library(loadperf SHARED set_module_type(loadperf win32dll) target_link_libraries(loadperf wine) add_importlibs(loadperf msvcrt kernel32 ntdll) -add_cab_target(loadperf 1) +add_cd_file(TARGET loadperf DESTINATION reactos/system32) add_importlib_target(loadperf.spec) diff --git a/dll/win32/localspl/CMakeLists.txt b/dll/win32/localspl/CMakeLists.txt index fcc72bbbaf2..406f201c260 100644 --- a/dll/win32/localspl/CMakeLists.txt +++ b/dll/win32/localspl/CMakeLists.txt @@ -32,4 +32,4 @@ add_importlibs(localspl kernel32 ntdll) -add_cab_target(localspl 1) +add_cd_file(TARGET localspl DESTINATION reactos/system32) diff --git a/dll/win32/localui/CMakeLists.txt b/dll/win32/localui/CMakeLists.txt index f1e179bd620..a66a3a6dcad 100644 --- a/dll/win32/localui/CMakeLists.txt +++ b/dll/win32/localui/CMakeLists.txt @@ -18,4 +18,4 @@ target_link_libraries(localui uuid wine) add_importlib_target(localui.spec) add_importlibs(localui winspool user32 msvcrt kernel32 ntdll) -add_cab_target(localui 1) +add_cd_file(TARGET localui DESTINATION reactos/system32) diff --git a/dll/win32/lpk/CMakeLists.txt b/dll/win32/lpk/CMakeLists.txt index 409dc2fbb64..2e10349db96 100644 --- a/dll/win32/lpk/CMakeLists.txt +++ b/dll/win32/lpk/CMakeLists.txt @@ -18,4 +18,4 @@ set_module_type(lpk win32dll) add_importlib_target(lpk.spec) add_importlibs(lpk user32 usp10 msvcrt kernel32 ntdll) -add_cab_target(lpk 1) +add_cd_file(TARGET lpk DESTINATION reactos/system32) diff --git a/dll/win32/lsasrv/CMakeLists.txt b/dll/win32/lsasrv/CMakeLists.txt index 641fe712062..436b52ca066 100644 --- a/dll/win32/lsasrv/CMakeLists.txt +++ b/dll/win32/lsasrv/CMakeLists.txt @@ -30,5 +30,5 @@ target_link_libraries(lsasrv add_importlibs(lsasrv rpcrt4 kernel32 ntdll) add_dependencies(lsasrv psdk) -add_cab_target(lsasrv 1) +add_cd_file(TARGET lsasrv DESTINATION reactos/system32) add_importlib_target(lsasrv.spec) diff --git a/dll/win32/lz32/CMakeLists.txt b/dll/win32/lz32/CMakeLists.txt index 0de9b6c7947..5c1bbbd4f4d 100644 --- a/dll/win32/lz32/CMakeLists.txt +++ b/dll/win32/lz32/CMakeLists.txt @@ -15,5 +15,5 @@ target_link_libraries(lz32 wine) add_importlibs(lz32 kernel32 ntdll) add_dependencies(lz32 psdk) -add_cab_target(lz32 1) +add_cd_file(TARGET lz32 DESTINATION reactos/system32) add_importlib_target(lz32.spec) diff --git a/dll/win32/mapi32/CMakeLists.txt b/dll/win32/mapi32/CMakeLists.txt index 08edaacf5d1..496383036af 100644 --- a/dll/win32/mapi32/CMakeLists.txt +++ b/dll/win32/mapi32/CMakeLists.txt @@ -23,4 +23,4 @@ set_module_type(mapi32 win32dll) target_link_libraries(mapi32 wine uuid) add_importlibs(mapi32 shlwapi shell32 user32 advapi32 msvcrt kernel32 ntdll) -add_cab_target(mapi32 1) +add_cd_file(TARGET mapi32 DESTINATION reactos/system32) diff --git a/dll/win32/mciavi32/CMakeLists.txt b/dll/win32/mciavi32/CMakeLists.txt index 36879d4708c..c71dd306943 100644 --- a/dll/win32/mciavi32/CMakeLists.txt +++ b/dll/win32/mciavi32/CMakeLists.txt @@ -17,4 +17,4 @@ add_library(mciavi32 SHARED ${SOURCE}) set_module_type(mciavi32 win32dll) target_link_libraries(mciavi32 wine) add_importlibs(mciavi32 msvfw32 winmm user32 gdi32 msvcrt kernel32 ntdll) -add_cab_target(mciavi32 1) +add_cd_file(TARGET mciavi32 DESTINATION reactos/system32) diff --git a/dll/win32/mcicda/CMakeLists.txt b/dll/win32/mcicda/CMakeLists.txt index 7c7e1605b9c..4ed51b1094f 100644 --- a/dll/win32/mcicda/CMakeLists.txt +++ b/dll/win32/mcicda/CMakeLists.txt @@ -14,4 +14,4 @@ set_entrypoint(mcicda 0) target_link_libraries(mcicda wine) add_importlibs(mcicda winmm user32 kernel32 ntdll) add_dependencies(mcicda psdk) -add_cab_target(mcicda 1) +add_cd_file(TARGET mcicda DESTINATION reactos/system32) diff --git a/dll/win32/mciqtz32/CMakeLists.txt b/dll/win32/mciqtz32/CMakeLists.txt index 76c85ab5490..dc46578be7d 100644 --- a/dll/win32/mciqtz32/CMakeLists.txt +++ b/dll/win32/mciqtz32/CMakeLists.txt @@ -15,4 +15,4 @@ set_module_type(mciqtz32 win32dll) target_link_libraries(mciqtz32 wine strmiids) add_importlibs(mciqtz32 winmm oleaut32 ole32 user32 gdi32 msvcrt kernel32 ntdll) -add_cab_target(mciqtz32 1) +add_cd_file(TARGET mciqtz32 DESTINATION reactos/system32) diff --git a/dll/win32/mciseq/CMakeLists.txt b/dll/win32/mciseq/CMakeLists.txt index 3153b2b66e5..985a9579e5e 100644 --- a/dll/win32/mciseq/CMakeLists.txt +++ b/dll/win32/mciseq/CMakeLists.txt @@ -14,4 +14,4 @@ set_entrypoint(mciseq 0) target_link_libraries(mciseq wine) add_importlibs(mciseq winmm user32 kernel32 ntdll msvcrt) add_dependencies(mciseq psdk) -add_cab_target(mciseq 1) +add_cd_file(TARGET mciseq DESTINATION reactos/system32) diff --git a/dll/win32/mciwave/CMakeLists.txt b/dll/win32/mciwave/CMakeLists.txt index 268c44e0ae0..3cf28888c52 100644 --- a/dll/win32/mciwave/CMakeLists.txt +++ b/dll/win32/mciwave/CMakeLists.txt @@ -18,4 +18,4 @@ set_entrypoint(mciwave 0) target_link_libraries(mciwave wine) add_importlibs(mciwave user32 winmm msvcrt kernel32 ntdll) add_dependencies(mciwave psdk) -add_cab_target(mciwave 1) +add_cd_file(TARGET mciwave DESTINATION reactos/system32) diff --git a/dll/win32/mlang/CMakeLists.txt b/dll/win32/mlang/CMakeLists.txt index cfbb1c520f7..0de3b3e70a4 100644 --- a/dll/win32/mlang/CMakeLists.txt +++ b/dll/win32/mlang/CMakeLists.txt @@ -33,4 +33,4 @@ add_importlibs(mlang add_importlib_target(mlang.spec) add_dependencies(mlang psdk) -add_cab_target(mlang 1) +add_cd_file(TARGET mlang DESTINATION reactos/system32) diff --git a/dll/win32/mmdrv/CMakeLists.txt b/dll/win32/mmdrv/CMakeLists.txt index 410347f12ad..1f0d7946aa8 100644 --- a/dll/win32/mmdrv/CMakeLists.txt +++ b/dll/win32/mmdrv/CMakeLists.txt @@ -20,4 +20,4 @@ add_library(mmdrv SHARED ${SOURCE}) set_entrypoint(mmdrv 0) add_importlibs(mmdrv winmm user32 kernel32 ntdll) add_dependencies(mmdrv psdk) -add_cab_target(mmdrv 1) +add_cd_file(TARGET mmdrv DESTINATION reactos/system32) diff --git a/dll/win32/modemui/CMakeLists.txt b/dll/win32/modemui/CMakeLists.txt index 50c536bcc4b..f57723fa5f8 100644 --- a/dll/win32/modemui/CMakeLists.txt +++ b/dll/win32/modemui/CMakeLists.txt @@ -14,4 +14,4 @@ add_library(modemui SHARED ${SOURCE}) set_module_type(modemui win32dll) add_importlibs(modemui msvcrt kernel32 ntdll) -add_cab_target(modemui 1) +add_cd_file(TARGET modemui DESTINATION reactos/system32) diff --git a/dll/win32/mpr/CMakeLists.txt b/dll/win32/mpr/CMakeLists.txt index 315efbebd45..0e71263c73e 100644 --- a/dll/win32/mpr/CMakeLists.txt +++ b/dll/win32/mpr/CMakeLists.txt @@ -26,5 +26,5 @@ set_module_type(mpr win32dll) target_link_libraries(mpr wine) add_importlibs(mpr advapi32 user32 msvcrt kernel32 ntdll) -add_cab_target(mpr 1) +add_cd_file(TARGET mpr DESTINATION reactos/system32) add_importlib_target(mpr.spec) diff --git a/dll/win32/mprapi/CMakeLists.txt b/dll/win32/mprapi/CMakeLists.txt index bcdee43856b..fd1319db074 100644 --- a/dll/win32/mprapi/CMakeLists.txt +++ b/dll/win32/mprapi/CMakeLists.txt @@ -14,4 +14,4 @@ add_library(mprapi SHARED ${SOURCE}) set_module_type(mprapi win32dll) target_link_libraries(mprapi wine) add_importlibs(mprapi msvcrt kernel32 ntdll) -add_cab_target(mprapi 1) +add_cd_file(TARGET mprapi DESTINATION reactos/system32) diff --git a/dll/win32/msacm32/CMakeLists.txt b/dll/win32/msacm32/CMakeLists.txt index 4c6ad37aab2..5e8ad3ef42b 100644 --- a/dll/win32/msacm32/CMakeLists.txt +++ b/dll/win32/msacm32/CMakeLists.txt @@ -28,7 +28,7 @@ target_link_libraries(msacm32 wine) add_importlibs(msacm32 msvcrt advapi32 user32 winmm kernel32 ntdll) add_dependencies(msacm32 psdk) -add_cab_target(msacm32 1) +add_cd_file(TARGET msacm32 DESTINATION reactos/system32) add_importlib_target(msacm32.spec) add_subdirectory(msacm32.drv) diff --git a/dll/win32/msacm32/msacm32.drv/CMakeLists.txt b/dll/win32/msacm32/msacm32.drv/CMakeLists.txt index 3a3f1ad3ed4..381207df65b 100644 --- a/dll/win32/msacm32/msacm32.drv/CMakeLists.txt +++ b/dll/win32/msacm32/msacm32.drv/CMakeLists.txt @@ -15,4 +15,4 @@ target_link_libraries(msacm32.drv wine) add_importlibs(msacm32.drv msacm32 user32 winmm advapi32 kernel32 ntdll) add_dependencies(msacm32.drv psdk) -add_cab_target(msacm32.drv 1) \ No newline at end of file +add_cd_file(TARGET msacm32.drv DESTINATION reactos/system32) \ No newline at end of file diff --git a/dll/win32/msadp32.acm/CMakeLists.txt b/dll/win32/msadp32.acm/CMakeLists.txt index 289d6a8e101..d74aac0479c 100644 --- a/dll/win32/msadp32.acm/CMakeLists.txt +++ b/dll/win32/msadp32.acm/CMakeLists.txt @@ -18,4 +18,4 @@ set_target_properties(msadp32.acm PROPERTIES SUFFIX "") target_link_libraries(msadp32.acm wine) add_importlibs(msadp32.acm winmm user32 msvcrt kernel32 ntdll) add_dependencies(msadp32.acm psdk) -add_cab_target(msadp32.acm 1) +add_cd_file(TARGET msadp32.acm DESTINATION reactos/system32) diff --git a/dll/win32/msafd/CMakeLists.txt b/dll/win32/msafd/CMakeLists.txt index 8a2c0f7d27d..9822ad4ec96 100644 --- a/dll/win32/msafd/CMakeLists.txt +++ b/dll/win32/msafd/CMakeLists.txt @@ -25,4 +25,4 @@ set_module_type(msafd win32dll) add_pch(msafd ${CMAKE_CURRENT_SOURCE_DIR}/msafd.h ${SOURCE}) add_importlibs(msafd advapi32 msvcrt kernel32 ntdll) -add_cab_target(msafd 1) +add_cd_file(TARGET msafd DESTINATION reactos/system32) diff --git a/dll/win32/mscat32/CMakeLists.txt b/dll/win32/mscat32/CMakeLists.txt index a9b4ece7e60..9bb41b54e22 100644 --- a/dll/win32/mscat32/CMakeLists.txt +++ b/dll/win32/mscat32/CMakeLists.txt @@ -14,4 +14,4 @@ add_library(mscat32 SHARED ${SOURCE}) set_module_type(mscat32 win32dll) target_link_libraries(mscat32 wine) add_importlibs(mscat32 wintrust msvcrt kernel32 ntdll) -add_cab_target(mscat32 1) +add_cd_file(TARGET mscat32 DESTINATION reactos/system32) diff --git a/dll/win32/mscms/CMakeLists.txt b/dll/win32/mscms/CMakeLists.txt index 5a77fedf661..a36a0fbee04 100644 --- a/dll/win32/mscms/CMakeLists.txt +++ b/dll/win32/mscms/CMakeLists.txt @@ -22,4 +22,4 @@ add_library(mscms SHARED ${SOURCE}) set_module_type(mscms win32dll) target_link_libraries(mscms wine) add_importlibs(mscms msvcrt advapi32 kernel32 ntdll) -add_cab_target(mscms 1) +add_cd_file(TARGET mscms DESTINATION reactos/system32) diff --git a/dll/win32/mscoree/CMakeLists.txt b/dll/win32/mscoree/CMakeLists.txt index 45cec4b9411..556232413de 100644 --- a/dll/win32/mscoree/CMakeLists.txt +++ b/dll/win32/mscoree/CMakeLists.txt @@ -15,4 +15,4 @@ add_library(mscoree SHARED ${SOURCE}) set_module_type(mscoree win32dll) target_link_libraries(mscoree wine uuid) add_importlibs(mscoree advapi32 shell32 msvcrt kernel32 ntdll) -add_cab_target(mscoree 1) +add_cd_file(TARGET mscoree DESTINATION reactos/system32) diff --git a/dll/win32/msctf/CMakeLists.txt b/dll/win32/msctf/CMakeLists.txt index 1b4aa4007f7..088a5e176b1 100644 --- a/dll/win32/msctf/CMakeLists.txt +++ b/dll/win32/msctf/CMakeLists.txt @@ -34,4 +34,4 @@ set_module_type(msctf win32dll) target_link_libraries(msctf uuid wine) add_importlibs(msctf ole32 oleaut32 user32 advapi32 msvcrt kernel32 ntdll) -add_cab_target(msctf 1) +add_cd_file(TARGET msctf DESTINATION reactos/system32) diff --git a/dll/win32/msftedit/CMakeLists.txt b/dll/win32/msftedit/CMakeLists.txt index 117ae3f05cc..8c7f38f6895 100644 --- a/dll/win32/msftedit/CMakeLists.txt +++ b/dll/win32/msftedit/CMakeLists.txt @@ -18,4 +18,4 @@ set_module_type(msftedit win32dll) target_link_libraries(msftedit uuid wine) add_importlibs(msftedit riched20 msvcrt kernel32 ntdll) -add_cab_target(msftedit 1) +add_cd_file(TARGET msftedit DESTINATION reactos/system32) diff --git a/dll/win32/msg711.acm/CMakeLists.txt b/dll/win32/msg711.acm/CMakeLists.txt index 1e8a69b14b6..66cde109c66 100644 --- a/dll/win32/msg711.acm/CMakeLists.txt +++ b/dll/win32/msg711.acm/CMakeLists.txt @@ -19,4 +19,4 @@ set_target_properties(msg711.acm PROPERTIES SUFFIX "") target_link_libraries(msg711.acm wine) add_importlibs(msg711.acm winmm user32 msvcrt kernel32 ntdll) add_dependencies(msg711.acm psdk) -add_cab_target(msg711.acm 1) +add_cd_file(TARGET msg711.acm DESTINATION reactos/system32) diff --git a/dll/win32/msgina/CMakeLists.txt b/dll/win32/msgina/CMakeLists.txt index 0a9f0e0273d..5f88dbf0de2 100644 --- a/dll/win32/msgina/CMakeLists.txt +++ b/dll/win32/msgina/CMakeLists.txt @@ -21,4 +21,4 @@ add_library(msgina SHARED ${SOURCE}) set_module_type(msgina win32dll) target_link_libraries(msgina wine) add_importlibs(msgina advapi32 user32 gdi32 userenv msvcrt kernel32 ntdll) -add_cab_target(msgina 1) +add_cd_file(TARGET msgina DESTINATION reactos/system32) diff --git a/dll/win32/msgsm32.acm/CMakeLists.txt b/dll/win32/msgsm32.acm/CMakeLists.txt index 1edc6f77e18..ba1f32b46a7 100644 --- a/dll/win32/msgsm32.acm/CMakeLists.txt +++ b/dll/win32/msgsm32.acm/CMakeLists.txt @@ -20,4 +20,4 @@ target_link_libraries(msgsm32.acm wine) add_importlibs(msgsm32.acm winmm user32 msvcrt kernel32 ntdll) add_dependencies(msgsm32.acm psdk) -add_cab_target(msgsm32.acm 1) +add_cd_file(TARGET msgsm32.acm DESTINATION reactos/system32) diff --git a/dll/win32/mshtml.tlb/CMakeLists.txt b/dll/win32/mshtml.tlb/CMakeLists.txt index 5958aa89955..7650ec43cb5 100644 --- a/dll/win32/mshtml.tlb/CMakeLists.txt +++ b/dll/win32/mshtml.tlb/CMakeLists.txt @@ -11,4 +11,4 @@ add_library(mshtml.tlb SHARED rsrc.rc) set_entrypoint(mshtml.tlb 0) set_target_properties(mshtml.tlb PROPERTIES SUFFIX "") add_dependencies(mshtml.tlb mshtml_tlb) -add_cab_target(mshtml.tlb 1) +add_cd_file(TARGET mshtml.tlb DESTINATION reactos/system32) diff --git a/dll/win32/mshtml/CMakeLists.txt b/dll/win32/mshtml/CMakeLists.txt index 422df098702..49926086ce8 100644 --- a/dll/win32/mshtml/CMakeLists.txt +++ b/dll/win32/mshtml/CMakeLists.txt @@ -105,4 +105,4 @@ add_importlibs(mshtml ntdll) add_dependencies(mshtml mshtml_nsiface_header) -add_cab_target(mshtml 1) +add_cd_file(TARGET mshtml DESTINATION reactos/system32) diff --git a/dll/win32/msi/CMakeLists.txt b/dll/win32/msi/CMakeLists.txt index 34964e7f94e..51aa18518cf 100644 --- a/dll/win32/msi/CMakeLists.txt +++ b/dll/win32/msi/CMakeLists.txt @@ -95,5 +95,5 @@ add_importlibs(msi kernel32 ntdll) -add_cab_target(msi 1) +add_cd_file(TARGET msi DESTINATION reactos/system32) add_importlib_target(msi.spec) diff --git a/dll/win32/msimg32/CMakeLists.txt b/dll/win32/msimg32/CMakeLists.txt index eeb8e2d03a5..69d8a4a3351 100644 --- a/dll/win32/msimg32/CMakeLists.txt +++ b/dll/win32/msimg32/CMakeLists.txt @@ -13,5 +13,5 @@ add_library(msimg32 SHARED ${SOURCE}) set_module_type(msimg32 win32dll) target_link_libraries(msimg32 wine) add_importlibs(msimg32 gdi32 msvcrt kernel32 ntdll) -add_cab_target(msimg32 1) +add_cd_file(TARGET msimg32 DESTINATION reactos/system32) add_importlib_target(msimg32.spec) diff --git a/dll/win32/msimtf/CMakeLists.txt b/dll/win32/msimtf/CMakeLists.txt index 698d01afcea..bb562c1802a 100644 --- a/dll/win32/msimtf/CMakeLists.txt +++ b/dll/win32/msimtf/CMakeLists.txt @@ -19,4 +19,4 @@ set_module_type(msimtf win32dll) target_link_libraries(msimtf uuid wine) add_importlibs(msimtf msvcrt imm32 kernel32 ntdll) -add_cab_target(msimtf 1) +add_cd_file(TARGET msimtf DESTINATION reactos/system32) diff --git a/dll/win32/msisip/CMakeLists.txt b/dll/win32/msisip/CMakeLists.txt index 0b1b4cb34b0..0f45f121a33 100644 --- a/dll/win32/msisip/CMakeLists.txt +++ b/dll/win32/msisip/CMakeLists.txt @@ -15,4 +15,4 @@ set_module_type(msisip win32dll) target_link_libraries(msisip wine) add_importlibs(msisip crypt32 ole32 msvcrt kernel32 ntdll) -add_cab_target(msisip 1) +add_cd_file(TARGET msisip DESTINATION reactos/system32) diff --git a/dll/win32/msisys.ocx/CMakeLists.txt b/dll/win32/msisys.ocx/CMakeLists.txt index 1c4997f6189..0f9bc3ba115 100644 --- a/dll/win32/msisys.ocx/CMakeLists.txt +++ b/dll/win32/msisys.ocx/CMakeLists.txt @@ -13,4 +13,4 @@ add_library(msisys SHARED ${SOURCE}) set_module_type(msisys win32ocx) target_link_libraries(msisys uuid wine) add_importlibs(msisys msvcrt kernel32 ntdll) -add_cab_target(msisys 1) +add_cd_file(TARGET msisys DESTINATION reactos/system32) diff --git a/dll/win32/msnet32/CMakeLists.txt b/dll/win32/msnet32/CMakeLists.txt index 49a525471d1..f39999bc4bd 100644 --- a/dll/win32/msnet32/CMakeLists.txt +++ b/dll/win32/msnet32/CMakeLists.txt @@ -12,4 +12,4 @@ target_link_libraries(msnet32 wine) add_importlibs(msnet32 msvcrt kernel32 ntdll) -add_cab_target(msnet32 1) +add_cd_file(TARGET msnet32 DESTINATION reactos/system32) diff --git a/dll/win32/msrle32/CMakeLists.txt b/dll/win32/msrle32/CMakeLists.txt index 6f8faa82fc8..b1ef8a0a11f 100644 --- a/dll/win32/msrle32/CMakeLists.txt +++ b/dll/win32/msrle32/CMakeLists.txt @@ -19,4 +19,4 @@ add_library(msrle32 SHARED ${SOURCE}) set_module_type(msrle32 win32dll) target_link_libraries(msrle32 wine) add_importlibs(msrle32 msvcrt winmm user32 kernel32 ntdll) -add_cab_target(msrle32 1) +add_cd_file(TARGET msrle32 DESTINATION reactos/system32) diff --git a/dll/win32/mssign32/CMakeLists.txt b/dll/win32/mssign32/CMakeLists.txt index 22705b0c924..86585285abf 100644 --- a/dll/win32/mssign32/CMakeLists.txt +++ b/dll/win32/mssign32/CMakeLists.txt @@ -17,4 +17,4 @@ target_link_libraries(mssign32 wine) add_importlibs(mssign32 msvcrt kernel32 ntdll) -add_cab_target(mssign32 1) +add_cd_file(TARGET mssign32 DESTINATION reactos/system32) diff --git a/dll/win32/mssip32/CMakeLists.txt b/dll/win32/mssip32/CMakeLists.txt index 9a33ec00c17..61242644523 100644 --- a/dll/win32/mssip32/CMakeLists.txt +++ b/dll/win32/mssip32/CMakeLists.txt @@ -17,4 +17,4 @@ target_link_libraries(mssip32 wine) add_importlibs(mssip32 msvcrt kernel32 ntdll) -add_cab_target(mssip32 1) +add_cd_file(TARGET mssip32 DESTINATION reactos/system32) diff --git a/dll/win32/mstask/CMakeLists.txt b/dll/win32/mstask/CMakeLists.txt index 58a350bea58..22c506c743c 100644 --- a/dll/win32/mstask/CMakeLists.txt +++ b/dll/win32/mstask/CMakeLists.txt @@ -34,4 +34,4 @@ target_link_libraries(mstask uuid wine) add_importlibs(mstask ole32 msvcrt kernel32 ntdll) -add_cab_target(mstask 1) +add_cd_file(TARGET mstask DESTINATION reactos/system32) diff --git a/dll/win32/msvcrt/CMakeLists.txt b/dll/win32/msvcrt/CMakeLists.txt index 2490aa3b4de..45814044253 100644 --- a/dll/win32/msvcrt/CMakeLists.txt +++ b/dll/win32/msvcrt/CMakeLists.txt @@ -40,6 +40,6 @@ target_link_libraries(msvcrt add_pch(msvcrt ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) add_importlibs(msvcrt kernel32 ntdll) -add_cab_target(msvcrt 1) +add_cd_file(TARGET msvcrt DESTINATION reactos/system32) add_importlib_target(msvcrt.spec) diff --git a/dll/win32/msvcrt20/CMakeLists.txt b/dll/win32/msvcrt20/CMakeLists.txt index 34c4fe0889c..14609dbe05a 100644 --- a/dll/win32/msvcrt20/CMakeLists.txt +++ b/dll/win32/msvcrt20/CMakeLists.txt @@ -17,4 +17,4 @@ target_link_libraries(msvcrt20 wine) add_importlibs(msvcrt20 msvcrt kernel32 ntdll) add_dependencies(msvcrt20 psdk) -add_cab_target(msvcrt20 1) +add_cd_file(TARGET msvcrt20 DESTINATION reactos/system32) diff --git a/dll/win32/msvcrt40/CMakeLists.txt b/dll/win32/msvcrt40/CMakeLists.txt index a546da850c4..a650fc91a71 100644 --- a/dll/win32/msvcrt40/CMakeLists.txt +++ b/dll/win32/msvcrt40/CMakeLists.txt @@ -18,4 +18,4 @@ target_link_libraries(msvcrt40 wine) add_importlibs(msvcrt40 msvcrt kernel32 ntdll) -add_cab_target(msvcrt40 1) +add_cd_file(TARGET msvcrt40 DESTINATION reactos/system32) diff --git a/dll/win32/msvfw32/CMakeLists.txt b/dll/win32/msvfw32/CMakeLists.txt index c95dc4434e6..a2ed86c8af8 100644 --- a/dll/win32/msvfw32/CMakeLists.txt +++ b/dll/win32/msvfw32/CMakeLists.txt @@ -23,5 +23,5 @@ target_link_libraries(msvfw32 wine) add_importlibs(msvfw32 winmm version comctl32 user32 gdi32 advapi32 msvcrt kernel32 ntdll) -add_cab_target(msvfw32 1) +add_cd_file(TARGET msvfw32 DESTINATION reactos/system32) add_importlib_target(msvfw32.spec) diff --git a/dll/win32/msvidc32/CMakeLists.txt b/dll/win32/msvidc32/CMakeLists.txt index 57e06368df5..6c7c8ed5c10 100644 --- a/dll/win32/msvidc32/CMakeLists.txt +++ b/dll/win32/msvidc32/CMakeLists.txt @@ -17,4 +17,4 @@ add_library(msvidc32 SHARED ${SOURCE}) set_module_type(msvidc32 win32dll) target_link_libraries(msvidc32 wine) add_importlibs(msvidc32 user32 msvcrt kernel32 ntdll) -add_cab_target(msvidc32 1) +add_cd_file(TARGET msvidc32 DESTINATION reactos/system32) diff --git a/dll/win32/mswsock/CMakeLists.txt b/dll/win32/mswsock/CMakeLists.txt index 28394667e93..c5dbde43d99 100644 --- a/dll/win32/mswsock/CMakeLists.txt +++ b/dll/win32/mswsock/CMakeLists.txt @@ -16,5 +16,5 @@ add_library(mswsock SHARED ${SOURCE}) set_module_type(mswsock win32dll) add_importlibs(mswsock ws2_32 msvcrt kernel32) -add_cab_target(mswsock 1) +add_cd_file(TARGET mswsock DESTINATION reactos/system32) add_importlib_target(mswsock.spec) diff --git a/dll/win32/msxml3/CMakeLists.txt b/dll/win32/msxml3/CMakeLists.txt index a816dec6ed9..999bf041d42 100644 --- a/dll/win32/msxml3/CMakeLists.txt +++ b/dll/win32/msxml3/CMakeLists.txt @@ -81,4 +81,4 @@ add_importlibs(msxml3 ntdll) add_dependencies(msxml3 msxml3_v1) -add_cab_target(msxml3 1) +add_cd_file(TARGET msxml3 DESTINATION reactos/system32) diff --git a/dll/win32/nddeapi/CMakeLists.txt b/dll/win32/nddeapi/CMakeLists.txt index 696f5623d49..bb1e2a25468 100644 --- a/dll/win32/nddeapi/CMakeLists.txt +++ b/dll/win32/nddeapi/CMakeLists.txt @@ -16,4 +16,4 @@ target_link_libraries(nddeapi wine) add_importlibs(nddeapi kernel32 ntdll) add_dependencies(nddeapi psdk) -add_cab_target(nddeapi 1) \ No newline at end of file +add_cd_file(TARGET nddeapi DESTINATION reactos/system32) \ No newline at end of file diff --git a/dll/win32/netapi32/CMakeLists.txt b/dll/win32/netapi32/CMakeLists.txt index 65f7bf6ccc5..536d696018e 100644 --- a/dll/win32/netapi32/CMakeLists.txt +++ b/dll/win32/netapi32/CMakeLists.txt @@ -28,5 +28,5 @@ target_link_libraries(netapi32 wine) add_importlibs(netapi32 iphlpapi ws2_32 advapi32 msvcrt kernel32 ntdll) -add_cab_target(netapi32 1) +add_cd_file(TARGET netapi32 DESTINATION reactos/system32) add_importlib_target(netapi32.spec) diff --git a/dll/win32/netcfgx/CMakeLists.txt b/dll/win32/netcfgx/CMakeLists.txt index 3286fdcab2c..0b0bc10fd19 100644 --- a/dll/win32/netcfgx/CMakeLists.txt +++ b/dll/win32/netcfgx/CMakeLists.txt @@ -24,4 +24,4 @@ target_link_libraries(netcfgx add_importlibs(netcfgx rpcrt4 setupapi advapi32 iphlpapi ole32 user32 comctl32 ws2_32 msvcrt kernel32 ntdll) -add_cab_target(netcfgx 1) +add_cd_file(TARGET netcfgx DESTINATION reactos/system32) diff --git a/dll/win32/netevent/CMakeLists.txt b/dll/win32/netevent/CMakeLists.txt index 986a8ca10ad..46a4e683a7c 100644 --- a/dll/win32/netevent/CMakeLists.txt +++ b/dll/win32/netevent/CMakeLists.txt @@ -10,4 +10,4 @@ set_module_type(netevent win32dll) add_importlibs(netevent msvcrt kernel32) add_dependencies(netevent neteventmsg) -add_cab_target(netevent 1) +add_cd_file(TARGET netevent DESTINATION reactos/system32) diff --git a/dll/win32/netid/CMakeLists.txt b/dll/win32/netid/CMakeLists.txt index 4e173342b3f..33fa00140da 100644 --- a/dll/win32/netid/CMakeLists.txt +++ b/dll/win32/netid/CMakeLists.txt @@ -11,4 +11,4 @@ add_library(netid SHARED ${SOURCE}) set_module_type(netid win32dll) add_importlibs(netid user32 gdi32 comctl32 advapi32 netapi32 msvcrt kernel32 ntdll) -add_cab_target(netid 1) +add_cd_file(TARGET netid DESTINATION reactos/system32) diff --git a/dll/win32/netshell/CMakeLists.txt b/dll/win32/netshell/CMakeLists.txt index e1043b2cf0e..481d17753bb 100644 --- a/dll/win32/netshell/CMakeLists.txt +++ b/dll/win32/netshell/CMakeLists.txt @@ -44,4 +44,4 @@ add_importlibs(netshell add_pch(netshell ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) -add_cab_target(netshell 1) +add_cd_file(TARGET netshell DESTINATION reactos/system32) diff --git a/dll/win32/newdev/CMakeLists.txt b/dll/win32/newdev/CMakeLists.txt index 33e519bffaf..8b6cf627edd 100644 --- a/dll/win32/newdev/CMakeLists.txt +++ b/dll/win32/newdev/CMakeLists.txt @@ -19,5 +19,5 @@ target_link_libraries(newdev wine) add_importlibs(newdev gdi32 comctl32 setupapi advapi32 user32 shell32 msvcrt kernel32 ntdll) -add_cab_target(newdev 1) +add_cd_file(TARGET newdev DESTINATION reactos/system32) add_importlib_target(newdev.spec) diff --git a/dll/win32/ntdsapi/CMakeLists.txt b/dll/win32/ntdsapi/CMakeLists.txt index 2ddfabcdf4e..fd25788ab24 100644 --- a/dll/win32/ntdsapi/CMakeLists.txt +++ b/dll/win32/ntdsapi/CMakeLists.txt @@ -17,4 +17,4 @@ target_link_libraries(ntdsapi wine) add_importlibs(ntdsapi user32 kernel32 ntdll) add_importlib_target(ntdsapi.spec) add_dependencies(ntdsapi psdk) -add_cab_target(ntdsapi 1) +add_cd_file(TARGET ntdsapi DESTINATION reactos/system32) diff --git a/dll/win32/ntlanman/CMakeLists.txt b/dll/win32/ntlanman/CMakeLists.txt index c741c8aac1d..686c68b1e2f 100644 --- a/dll/win32/ntlanman/CMakeLists.txt +++ b/dll/win32/ntlanman/CMakeLists.txt @@ -17,4 +17,4 @@ target_link_libraries(ntlanman wine) add_importlibs(ntlanman netapi32 msvcrt kernel32 ntdll) -add_cab_target(ntlanman 1) +add_cd_file(TARGET ntlanman DESTINATION reactos/system32) diff --git a/dll/win32/ntmarta/CMakeLists.txt b/dll/win32/ntmarta/CMakeLists.txt index 2e7cb18a88e..b29f2267f1a 100644 --- a/dll/win32/ntmarta/CMakeLists.txt +++ b/dll/win32/ntmarta/CMakeLists.txt @@ -24,4 +24,4 @@ add_importlibs(ntmarta kernel32 ntdll) -add_cab_target(ntmarta 1) +add_cd_file(TARGET ntmarta DESTINATION reactos/system32) diff --git a/dll/win32/ntprint/CMakeLists.txt b/dll/win32/ntprint/CMakeLists.txt index 9bebbdb55a3..6dcdd48cf11 100644 --- a/dll/win32/ntprint/CMakeLists.txt +++ b/dll/win32/ntprint/CMakeLists.txt @@ -18,4 +18,4 @@ target_link_libraries(ntprint wine) add_importlibs(ntprint winspool msvcrt kernel32 ntdll) add_dependencies(ntprint psdk) -add_cab_target(ntprint 1) +add_cd_file(TARGET ntprint DESTINATION reactos/system32) diff --git a/dll/win32/objsel/CMakeLists.txt b/dll/win32/objsel/CMakeLists.txt index a6cee9b6204..08356b5b578 100644 --- a/dll/win32/objsel/CMakeLists.txt +++ b/dll/win32/objsel/CMakeLists.txt @@ -29,4 +29,4 @@ add_importlibs(objsel kernel32 ntdll) -add_cab_target(objsel 1) +add_cd_file(TARGET objsel DESTINATION reactos/system32) diff --git a/dll/win32/odbc32/CMakeLists.txt b/dll/win32/odbc32/CMakeLists.txt index e4019cdff8d..a0dcdc05d55 100644 --- a/dll/win32/odbc32/CMakeLists.txt +++ b/dll/win32/odbc32/CMakeLists.txt @@ -24,4 +24,4 @@ add_importlibs(odbc32 ntdll) -add_cab_target(odbc32 1) +add_cd_file(TARGET odbc32 DESTINATION reactos/system32) diff --git a/dll/win32/odbccp32/CMakeLists.txt b/dll/win32/odbccp32/CMakeLists.txt index 00b6696d375..e58c06b8122 100644 --- a/dll/win32/odbccp32/CMakeLists.txt +++ b/dll/win32/odbccp32/CMakeLists.txt @@ -24,4 +24,4 @@ add_importlibs(odbccp32 ntdll) add_importlib_target(odbccp32.spec) -add_cab_target(odbccp32 1) +add_cd_file(TARGET odbccp32 DESTINATION reactos/system32) diff --git a/dll/win32/ole32/CMakeLists.txt b/dll/win32/ole32/CMakeLists.txt index f0163bdd930..24494bb73ef 100644 --- a/dll/win32/ole32/CMakeLists.txt +++ b/dll/win32/ole32/CMakeLists.txt @@ -82,5 +82,5 @@ target_link_libraries(ole32 add_importlibs(ole32 advapi32 user32 gdi32 rpcrt4 msvcrt kernel32 ntdll) add_dependencies(ole32 ole32idl) -add_cab_target(ole32 1) +add_cd_file(TARGET ole32 DESTINATION reactos/system32) add_importlib_target(ole32.spec) diff --git a/dll/win32/oleacc/CMakeLists.txt b/dll/win32/oleacc/CMakeLists.txt index bf85a9a419a..60155f8d954 100644 --- a/dll/win32/oleacc/CMakeLists.txt +++ b/dll/win32/oleacc/CMakeLists.txt @@ -20,4 +20,4 @@ target_link_libraries(oleacc wine) add_importlibs(oleacc user32 msvcrt kernel32 ntdll) add_importlib_target(oleacc.spec) -add_cab_target(oleacc 1) +add_cd_file(TARGET oleacc DESTINATION reactos/system32) diff --git a/dll/win32/oleaut32/CMakeLists.txt b/dll/win32/oleaut32/CMakeLists.txt index 5c5db8bcae3..a856ce35fd2 100644 --- a/dll/win32/oleaut32/CMakeLists.txt +++ b/dll/win32/oleaut32/CMakeLists.txt @@ -62,5 +62,5 @@ target_link_libraries(oleaut32 add_importlibs(oleaut32 windowscodecs ole32 rpcrt4 user32 gdi32 advapi32 comctl32 urlmon msvcrt kernel32 ntdll) -add_cab_target(oleaut32 1) +add_cd_file(TARGET oleaut32 DESTINATION reactos/system32) add_importlib_target(oleaut32.spec) diff --git a/dll/win32/olecli32/CMakeLists.txt b/dll/win32/olecli32/CMakeLists.txt index dc69bc0039c..c942ae9ab7f 100644 --- a/dll/win32/olecli32/CMakeLists.txt +++ b/dll/win32/olecli32/CMakeLists.txt @@ -17,4 +17,4 @@ target_link_libraries(olecli32 wine) add_importlibs(olecli32 ole32 gdi32 kernel32 ntdll) add_dependencies(olecli32 psdk) -add_cab_target(olecli32 1) +add_cd_file(TARGET olecli32 DESTINATION reactos/system32) diff --git a/dll/win32/oledlg/CMakeLists.txt b/dll/win32/oledlg/CMakeLists.txt index 00fdb6524c8..9c8b50b8e65 100644 --- a/dll/win32/oledlg/CMakeLists.txt +++ b/dll/win32/oledlg/CMakeLists.txt @@ -17,4 +17,4 @@ set_module_type(oledlg win32dll) target_link_libraries(oledlg wine) add_importlibs(oledlg ole32 comdlg32 user32 advapi32 msvcrt kernel32 ntdll) add_importlib_target(oledlg.spec) -add_cab_target(oledlg 1) +add_cd_file(TARGET oledlg DESTINATION reactos/system32) diff --git a/dll/win32/olepro32/CMakeLists.txt b/dll/win32/olepro32/CMakeLists.txt index 6605de3a6b5..0f97303c633 100644 --- a/dll/win32/olepro32/CMakeLists.txt +++ b/dll/win32/olepro32/CMakeLists.txt @@ -20,4 +20,4 @@ add_importlibs(olepro32 kernel32 ntdll) -add_cab_target(olepro32 1) +add_cd_file(TARGET olepro32 DESTINATION reactos/system32) diff --git a/dll/win32/olesvr32/CMakeLists.txt b/dll/win32/olesvr32/CMakeLists.txt index de3af057ea8..6f4c7c32fe4 100644 --- a/dll/win32/olesvr32/CMakeLists.txt +++ b/dll/win32/olesvr32/CMakeLists.txt @@ -19,4 +19,4 @@ target_link_libraries(olesvr32 add_importlibs(olesvr32 kernel32 ntdll) add_dependencies(olesvr32 psdk) -add_cab_target(olesvr32 1) +add_cd_file(TARGET olesvr32 DESTINATION reactos/system32) diff --git a/dll/win32/olethk32/CMakeLists.txt b/dll/win32/olethk32/CMakeLists.txt index 8e5c7c57576..1111a582201 100644 --- a/dll/win32/olethk32/CMakeLists.txt +++ b/dll/win32/olethk32/CMakeLists.txt @@ -19,4 +19,4 @@ target_link_libraries(olethk32 wine) add_importlibs(olethk32 msvcrt kernel32 ntdll) add_dependencies(olethk32 psdk) -add_cab_target(olethk32 1) +add_cd_file(TARGET olethk32 DESTINATION reactos/system32) diff --git a/dll/win32/opengl32/CMakeLists.txt b/dll/win32/opengl32/CMakeLists.txt index 1cf8f188460..25863f93504 100644 --- a/dll/win32/opengl32/CMakeLists.txt +++ b/dll/win32/opengl32/CMakeLists.txt @@ -30,5 +30,5 @@ add_importlibs(opengl32 add_pch(opengl32 ${CMAKE_CURRENT_SOURCE_DIR}/opengl32.h ${SOURCE}) -add_cab_target(opengl32 1) +add_cd_file(TARGET opengl32 DESTINATION reactos/system32) add_importlib_target(opengl32.spec) diff --git a/dll/win32/pdh/CMakeLists.txt b/dll/win32/pdh/CMakeLists.txt index 5c8b40bbb97..f772cef8d5e 100644 --- a/dll/win32/pdh/CMakeLists.txt +++ b/dll/win32/pdh/CMakeLists.txt @@ -21,4 +21,4 @@ target_link_libraries(pdh wine) add_importlibs(pdh kernel32 ntdll msvcrt) add_importlib_target(pdh.spec) -add_cab_target(pdh 1) +add_cd_file(TARGET pdh DESTINATION reactos/system32) diff --git a/dll/win32/pidgen/CMakeLists.txt b/dll/win32/pidgen/CMakeLists.txt index 81c1f7efacb..509bff100eb 100644 --- a/dll/win32/pidgen/CMakeLists.txt +++ b/dll/win32/pidgen/CMakeLists.txt @@ -19,4 +19,4 @@ target_link_libraries(pidgen wine) add_importlibs(pidgen msvcrt kernel32 ntdll) -add_cab_target(pidgen 1) +add_cd_file(TARGET pidgen DESTINATION reactos/system32) diff --git a/dll/win32/powrprof/CMakeLists.txt b/dll/win32/powrprof/CMakeLists.txt index 79beb82cc3a..e23c882ff8c 100644 --- a/dll/win32/powrprof/CMakeLists.txt +++ b/dll/win32/powrprof/CMakeLists.txt @@ -14,4 +14,4 @@ target_link_libraries(powrprof wine) add_importlibs(powrprof advapi32 user32 comctl32 msvcrt kernel32 ntdll) add_importlib_target(powrprof.spec) -add_cab_target(powrprof 1) +add_cd_file(TARGET powrprof DESTINATION reactos/system32) diff --git a/dll/win32/printui/CMakeLists.txt b/dll/win32/printui/CMakeLists.txt index 5eab2d12d98..7ea12484e0d 100644 --- a/dll/win32/printui/CMakeLists.txt +++ b/dll/win32/printui/CMakeLists.txt @@ -18,4 +18,4 @@ target_link_libraries(printui wine) add_importlibs(printui shell32 kernel32 ntdll) add_dependencies(printui psdk) -add_cab_target(printui 1) +add_cd_file(TARGET printui DESTINATION reactos/system32) diff --git a/dll/win32/psapi/CMakeLists.txt b/dll/win32/psapi/CMakeLists.txt index fe8bbe01a6d..5946b68fcfc 100644 --- a/dll/win32/psapi/CMakeLists.txt +++ b/dll/win32/psapi/CMakeLists.txt @@ -16,4 +16,4 @@ target_link_libraries(psapi epsapi ${PSEH_LIB}) add_importlibs(psapi msvcrt kernel32 ntdll) add_importlib_target(psapi.spec) add_pch(psapi ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) -add_cab_target(psapi 1) +add_cd_file(TARGET psapi DESTINATION reactos/system32) diff --git a/dll/win32/pstorec/CMakeLists.txt b/dll/win32/pstorec/CMakeLists.txt index 88b23c64870..85026cfed7a 100644 --- a/dll/win32/pstorec/CMakeLists.txt +++ b/dll/win32/pstorec/CMakeLists.txt @@ -19,4 +19,4 @@ set_module_type(pstorec win32dll) target_link_libraries(pstorec uuid wine) add_importlibs(pstorec msvcrt kernel32 ntdll) add_dependencies(pstorec pstorec_tlb) -add_cab_target(pstorec 1) +add_cd_file(TARGET pstorec DESTINATION reactos/system32) diff --git a/dll/win32/qmgr/CMakeLists.txt b/dll/win32/qmgr/CMakeLists.txt index 15d4ad71c23..e137c9df122 100644 --- a/dll/win32/qmgr/CMakeLists.txt +++ b/dll/win32/qmgr/CMakeLists.txt @@ -28,5 +28,5 @@ add_idl_headers(qmgr_idlheader qmgr_local.idl) set_module_type(qmgr win32dll) target_link_libraries(qmgr uuid wine) add_importlibs(qmgr ole32 wininet urlmon advapi32 msvcrt kernel32 ntdll) -add_cab_target(qmgr 1) +add_cd_file(TARGET qmgr DESTINATION reactos/system32) add_dependencies(qmgr qmgr_idlheader) diff --git a/dll/win32/qmgrprxy/CMakeLists.txt b/dll/win32/qmgrprxy/CMakeLists.txt index 1659811fa60..2f1fb48f803 100644 --- a/dll/win32/qmgrprxy/CMakeLists.txt +++ b/dll/win32/qmgrprxy/CMakeLists.txt @@ -21,4 +21,4 @@ add_library(qmgrprxy SHARED ${SOURCE}) set_module_type(qmgrprxy win32dll) target_link_libraries(qmgrprxy qmgrprxylib ${PSEH_LIB} wine) add_importlibs(qmgrprxy rpcrt4 msvcrt kernel32 ntdll) -add_cab_target(qmgrprxy 1) +add_cd_file(TARGET qmgrprxy DESTINATION reactos/system32) diff --git a/dll/win32/query/CMakeLists.txt b/dll/win32/query/CMakeLists.txt index f934bf87666..fcf60bea032 100644 --- a/dll/win32/query/CMakeLists.txt +++ b/dll/win32/query/CMakeLists.txt @@ -19,4 +19,4 @@ target_link_libraries(query add_importlibs(query msvcrt kernel32 ntdll) -add_cab_target(query 1) +add_cd_file(TARGET query DESTINATION reactos/system32) diff --git a/dll/win32/rasadhlp/CMakeLists.txt b/dll/win32/rasadhlp/CMakeLists.txt index 417d4e5ab9b..dfb20a21894 100644 --- a/dll/win32/rasadhlp/CMakeLists.txt +++ b/dll/win32/rasadhlp/CMakeLists.txt @@ -16,4 +16,4 @@ set_module_type(rasadhlp win32dll) add_importlibs(rasadhlp ws2_32 msvcrt kernel32 ntdll) -add_cab_target(rasadhlp 1) +add_cd_file(TARGET rasadhlp DESTINATION reactos/system32) diff --git a/dll/win32/rasapi32/CMakeLists.txt b/dll/win32/rasapi32/CMakeLists.txt index 9acb46dee8b..5d6c484bc93 100644 --- a/dll/win32/rasapi32/CMakeLists.txt +++ b/dll/win32/rasapi32/CMakeLists.txt @@ -18,4 +18,4 @@ target_link_libraries(rasapi32 wine) add_importlibs(rasapi32 kernel32 ntdll) add_importlib_target(rasapi32.spec) add_dependencies(rasapi32 psdk) -add_cab_target(rasapi32 1) +add_cd_file(TARGET rasapi32 DESTINATION reactos/system32) diff --git a/dll/win32/rasdlg/CMakeLists.txt b/dll/win32/rasdlg/CMakeLists.txt index de31096c030..1bf27346755 100644 --- a/dll/win32/rasdlg/CMakeLists.txt +++ b/dll/win32/rasdlg/CMakeLists.txt @@ -18,4 +18,4 @@ target_link_libraries(rasdlg add_importlibs(rasdlg msvcrt kernel32 ntdll) -add_cab_target(rasdlg 1) +add_cd_file(TARGET rasdlg DESTINATION reactos/system32) diff --git a/dll/win32/rasman/CMakeLists.txt b/dll/win32/rasman/CMakeLists.txt index 479dbb4e92d..3e9d731c013 100644 --- a/dll/win32/rasman/CMakeLists.txt +++ b/dll/win32/rasman/CMakeLists.txt @@ -17,4 +17,4 @@ target_link_libraries(rasman add_importlibs(rasman msvcrt kernel32 ntdll) -add_cab_target(rasman 1) +add_cd_file(TARGET rasman DESTINATION reactos/system32) diff --git a/dll/win32/resutils/CMakeLists.txt b/dll/win32/resutils/CMakeLists.txt index 4eb67fbb127..06db7bce31e 100644 --- a/dll/win32/resutils/CMakeLists.txt +++ b/dll/win32/resutils/CMakeLists.txt @@ -17,4 +17,4 @@ target_link_libraries(resutils wine) add_importlibs(resutils msvcrt kernel32 ntdll) -add_cab_target(resutils 1) +add_cd_file(TARGET resutils DESTINATION reactos/system32) diff --git a/dll/win32/riched20/CMakeLists.txt b/dll/win32/riched20/CMakeLists.txt index 1f00e6393b0..fbd850480e8 100644 --- a/dll/win32/riched20/CMakeLists.txt +++ b/dll/win32/riched20/CMakeLists.txt @@ -52,4 +52,4 @@ add_importlibs(riched20 add_importlib_target(riched20.spec) -add_cab_target(riched20 1) +add_cd_file(TARGET riched20 DESTINATION reactos/system32) diff --git a/dll/win32/riched32/CMakeLists.txt b/dll/win32/riched32/CMakeLists.txt index e4117b39837..886156b1d66 100644 --- a/dll/win32/riched32/CMakeLists.txt +++ b/dll/win32/riched32/CMakeLists.txt @@ -14,4 +14,4 @@ add_library(riched32 SHARED ${SOURCE}) set_module_type(riched32 win32dll) target_link_libraries(riched32 wine) add_importlibs(riched32 riched20 user32 msvcrt kernel32 ntdll) -add_cab_target(riched32 1) +add_cd_file(TARGET riched32 DESTINATION reactos/system32) diff --git a/dll/win32/rpcrt4/CMakeLists.txt b/dll/win32/rpcrt4/CMakeLists.txt index df7cca5fcba..df9da971c30 100644 --- a/dll/win32/rpcrt4/CMakeLists.txt +++ b/dll/win32/rpcrt4/CMakeLists.txt @@ -49,5 +49,5 @@ target_link_libraries(rpcrt4 add_importlibs(rpcrt4 msvcrt user32 advapi32 secur32 iphlpapi ws2_32 kernel32 ntdll) add_dependencies(rpcrt4 winesdk) -add_cab_target(rpcrt4 1) +add_cd_file(TARGET rpcrt4 DESTINATION reactos/system32) add_importlib_target(rpcrt4.spec) diff --git a/dll/win32/rsabase/CMakeLists.txt b/dll/win32/rsabase/CMakeLists.txt index 94f4aa2eba0..9b3f9dc1378 100644 --- a/dll/win32/rsabase/CMakeLists.txt +++ b/dll/win32/rsabase/CMakeLists.txt @@ -13,4 +13,4 @@ add_library(rsabase SHARED ${SOURCE}) set_entrypoint(rsabase 0) target_link_libraries(rsabase wine) add_importlibs(rsabase rsaenh ntdll) -add_cab_target(rsabase 1) +add_cd_file(TARGET rsabase DESTINATION reactos/system32) diff --git a/dll/win32/rsaenh/CMakeLists.txt b/dll/win32/rsaenh/CMakeLists.txt index 960abe5cf22..2036e174ec8 100644 --- a/dll/win32/rsaenh/CMakeLists.txt +++ b/dll/win32/rsaenh/CMakeLists.txt @@ -28,4 +28,4 @@ set_module_type(rsaenh win32dll) target_link_libraries(rsaenh wine) add_importlibs(rsaenh msvcrt crypt32 advapi32 kernel32 ntdll) add_importlib_target(rsaenh.spec) -add_cab_target(rsaenh 1) +add_cd_file(TARGET rsaenh DESTINATION reactos/system32) diff --git a/dll/win32/samlib/CMakeLists.txt b/dll/win32/samlib/CMakeLists.txt index ea648fa5664..139990f3479 100644 --- a/dll/win32/samlib/CMakeLists.txt +++ b/dll/win32/samlib/CMakeLists.txt @@ -18,5 +18,5 @@ set_module_type(samlib win32dll) add_importlibs(samlib advapi32 msvcrt kernel32 ntdll) -add_cab_target(samlib 1) +add_cd_file(TARGET samlib DESTINATION reactos/system32) add_importlib_target(samlib.spec) diff --git a/dll/win32/samsrv/CMakeLists.txt b/dll/win32/samsrv/CMakeLists.txt index 268c4449a82..44dd3a6ad7e 100644 --- a/dll/win32/samsrv/CMakeLists.txt +++ b/dll/win32/samsrv/CMakeLists.txt @@ -13,4 +13,4 @@ add_library(samsrv SHARED ${SOURCE}) set_entrypoint(samsrv 0) add_importlibs(samsrv kernel32 ntdll) add_dependencies(samsrv psdk) -add_cab_target(samsrv 1) +add_cd_file(TARGET samsrv DESTINATION reactos/system32) diff --git a/dll/win32/sccbase/CMakeLists.txt b/dll/win32/sccbase/CMakeLists.txt index c0813c735c8..859bc463057 100644 --- a/dll/win32/sccbase/CMakeLists.txt +++ b/dll/win32/sccbase/CMakeLists.txt @@ -17,4 +17,4 @@ target_link_libraries(sccbase wine) add_importlibs(sccbase msvcrt kernel32 ntdll) -add_cab_target(sccbase 1) +add_cd_file(TARGET sccbase DESTINATION reactos/system32) diff --git a/dll/win32/schannel/CMakeLists.txt b/dll/win32/schannel/CMakeLists.txt index 3301adb1b68..d4360722166 100644 --- a/dll/win32/schannel/CMakeLists.txt +++ b/dll/win32/schannel/CMakeLists.txt @@ -20,4 +20,4 @@ target_link_libraries(schannel wine) add_importlibs(schannel secur32 msvcrt kernel32 ntdll) -add_cab_target(schannel 1) +add_cd_file(TARGET schannel DESTINATION reactos/system32) diff --git a/dll/win32/secur32/CMakeLists.txt b/dll/win32/secur32/CMakeLists.txt index 3db2d522a65..2dde2388e37 100644 --- a/dll/win32/secur32/CMakeLists.txt +++ b/dll/win32/secur32/CMakeLists.txt @@ -25,5 +25,5 @@ target_link_libraries(secur32 lsalib) add_importlibs(secur32 advapi32 msvcrt kernel32 ntdll) add_pch(secur32 ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) -add_cab_target(secur32 1) +add_cd_file(TARGET secur32 DESTINATION reactos/system32) add_importlib_target(secur32.spec) diff --git a/dll/win32/security/CMakeLists.txt b/dll/win32/security/CMakeLists.txt index 2488293ab2a..c4fc43bc78c 100644 --- a/dll/win32/security/CMakeLists.txt +++ b/dll/win32/security/CMakeLists.txt @@ -13,4 +13,4 @@ set_entrypoint(security 0) add_importlibs(security secur32 advapi32 ntdll kernel32) -add_cab_target(security 1) +add_cd_file(TARGET security DESTINATION reactos/system32) diff --git a/dll/win32/sensapi/CMakeLists.txt b/dll/win32/sensapi/CMakeLists.txt index fb05f6c02fe..014ccddf14b 100644 --- a/dll/win32/sensapi/CMakeLists.txt +++ b/dll/win32/sensapi/CMakeLists.txt @@ -14,4 +14,4 @@ set_module_type(sensapi win32dll) target_link_libraries(sensapi wine) add_importlibs(sensapi msvcrt kernel32 ntdll) add_importlib_target(sensapi.spec) -add_cab_target(sensapi 1) +add_cd_file(TARGET sensapi DESTINATION reactos/system32) diff --git a/dll/win32/serialui/CMakeLists.txt b/dll/win32/serialui/CMakeLists.txt index 5ac1ed50fdc..cbe1369bd8c 100644 --- a/dll/win32/serialui/CMakeLists.txt +++ b/dll/win32/serialui/CMakeLists.txt @@ -12,4 +12,4 @@ add_library(serialui SHARED ${SOURCE}) set_module_type(serialui win32dll) add_importlibs(serialui user32 shlwapi msvcrt kernel32) -add_cab_target(serialui 1) +add_cd_file(TARGET serialui DESTINATION reactos/system32) diff --git a/dll/win32/setupapi/CMakeLists.txt b/dll/win32/setupapi/CMakeLists.txt index 49085837573..be426e2f7fb 100644 --- a/dll/win32/setupapi/CMakeLists.txt +++ b/dll/win32/setupapi/CMakeLists.txt @@ -59,5 +59,5 @@ add_importlibs(setupapi ntdll) -add_cab_target(setupapi 1) +add_cd_file(TARGET setupapi DESTINATION reactos/system32) add_importlib_target(setupapi.spec) diff --git a/dll/win32/sfc/CMakeLists.txt b/dll/win32/sfc/CMakeLists.txt index e17ddc8298b..04acc1d811e 100644 --- a/dll/win32/sfc/CMakeLists.txt +++ b/dll/win32/sfc/CMakeLists.txt @@ -15,4 +15,4 @@ set_module_type(sfc win32dll) add_importlibs(sfc msvcrt kernel32 ntdll) add_pch(sfc ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) -add_cab_target(sfc 1) +add_cd_file(TARGET sfc DESTINATION reactos/system32) diff --git a/dll/win32/sfc_os/CMakeLists.txt b/dll/win32/sfc_os/CMakeLists.txt index 8840daf13fb..1f38a28c22a 100644 --- a/dll/win32/sfc_os/CMakeLists.txt +++ b/dll/win32/sfc_os/CMakeLists.txt @@ -15,4 +15,4 @@ set_module_type(sfc_os win32dll) add_importlibs(sfc_os msvcrt kernel32 ntdll) add_pch(sfc_os ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) -add_cab_target(sfc_os 1) +add_cd_file(TARGET sfc_os DESTINATION reactos/system32) diff --git a/dll/win32/shdoclc/CMakeLists.txt b/dll/win32/shdoclc/CMakeLists.txt index 427164e824b..9cf85caa8db 100644 --- a/dll/win32/shdoclc/CMakeLists.txt +++ b/dll/win32/shdoclc/CMakeLists.txt @@ -14,4 +14,4 @@ target_link_libraries(shdoclc wine) add_importlibs(shdoclc kernel32 ntdll) add_dependencies(shdoclc psdk) -add_cab_target(shdoclc 1) \ No newline at end of file +add_cd_file(TARGET shdoclc DESTINATION reactos/system32) \ No newline at end of file diff --git a/dll/win32/shdocvw/CMakeLists.txt b/dll/win32/shdocvw/CMakeLists.txt index 125c4a544fa..3fb08cf7b57 100644 --- a/dll/win32/shdocvw/CMakeLists.txt +++ b/dll/win32/shdocvw/CMakeLists.txt @@ -54,5 +54,5 @@ add_importlibs(shdocvw ntdll) add_dependencies(shdocvw shdocvw_v1) -add_cab_target(shdocvw 1) +add_cd_file(TARGET shdocvw DESTINATION reactos/system32) add_importlib_target(shdocvw.spec) diff --git a/dll/win32/shell32/CMakeLists.txt b/dll/win32/shell32/CMakeLists.txt index 9998bbca44b..2a4298bbfce 100644 --- a/dll/win32/shell32/CMakeLists.txt +++ b/dll/win32/shell32/CMakeLists.txt @@ -102,5 +102,5 @@ add_importlibs(shell32 msvcrt ntdll) -add_cab_target(shell32 1) +add_cd_file(TARGET shell32 DESTINATION reactos/system32) add_importlib_target(shell32.spec) diff --git a/dll/win32/shfolder/CMakeLists.txt b/dll/win32/shfolder/CMakeLists.txt index dba58f784f5..08bd905fa9a 100644 --- a/dll/win32/shfolder/CMakeLists.txt +++ b/dll/win32/shfolder/CMakeLists.txt @@ -15,4 +15,4 @@ set_entrypoint(shfolder 0) target_link_libraries(shfolder wine) add_importlibs(shfolder shell32 kernel32 ntdll) add_dependencies(shfolder psdk) -add_cab_target(shfolder 1) +add_cd_file(TARGET shfolder DESTINATION reactos/system32) diff --git a/dll/win32/shimgvw/CMakeLists.txt b/dll/win32/shimgvw/CMakeLists.txt index 2976ddd3cf7..85e74b5e937 100644 --- a/dll/win32/shimgvw/CMakeLists.txt +++ b/dll/win32/shimgvw/CMakeLists.txt @@ -24,4 +24,4 @@ add_importlibs(shimgvw kernel32 ntdll) -add_cab_target(shimgvw 1) +add_cd_file(TARGET shimgvw DESTINATION reactos/system32) diff --git a/dll/win32/shlwapi/CMakeLists.txt b/dll/win32/shlwapi/CMakeLists.txt index eb444a985ca..9d832611426 100644 --- a/dll/win32/shlwapi/CMakeLists.txt +++ b/dll/win32/shlwapi/CMakeLists.txt @@ -52,6 +52,6 @@ add_importlibs(shlwapi msvcrt ntdll) -add_cab_target(shlwapi 1) +add_cd_file(TARGET shlwapi DESTINATION reactos/system32) add_importlib_target(shlwapi.spec) diff --git a/dll/win32/slbcsp/CMakeLists.txt b/dll/win32/slbcsp/CMakeLists.txt index 67d8326a3fe..36641f04c88 100644 --- a/dll/win32/slbcsp/CMakeLists.txt +++ b/dll/win32/slbcsp/CMakeLists.txt @@ -17,4 +17,4 @@ target_link_libraries(slbcsp wine) add_importlibs(slbcsp msvcrt kernel32 ntdll) -add_cab_target(slbcsp 1) +add_cd_file(TARGET slbcsp DESTINATION reactos/system32) diff --git a/dll/win32/smdll/CMakeLists.txt b/dll/win32/smdll/CMakeLists.txt index 9d5d1cac1e9..f0caa57f6e9 100644 --- a/dll/win32/smdll/CMakeLists.txt +++ b/dll/win32/smdll/CMakeLists.txt @@ -14,5 +14,5 @@ add_library(smdll SHARED ${SOURCE}) target_link_libraries(smdll smlib) add_importlibs(smdll ntdll) add_dependencies(smdll psdk) -add_cab_target(smdll 1) +add_cd_file(TARGET smdll DESTINATION reactos/system32) add_importlib_target(smdll.spec) diff --git a/dll/win32/sndblst/CMakeLists.txt b/dll/win32/sndblst/CMakeLists.txt index b78fc3d5218..1cb61ea1c2e 100644 --- a/dll/win32/sndblst/CMakeLists.txt +++ b/dll/win32/sndblst/CMakeLists.txt @@ -15,4 +15,4 @@ add_library(sndblst SHARED ${SOURCE}) set_module_type(sndblst win32dll) target_link_libraries(sndblst mment4 mmebuddy) add_importlibs(sndblst user32 winmm advapi32 msvcrt kernel32 ntdll) -add_cab_target(sndblst 1) +add_cd_file(TARGET sndblst DESTINATION reactos/system32) diff --git a/dll/win32/snmpapi/CMakeLists.txt b/dll/win32/snmpapi/CMakeLists.txt index 9bde5c48610..0f11b1612a8 100644 --- a/dll/win32/snmpapi/CMakeLists.txt +++ b/dll/win32/snmpapi/CMakeLists.txt @@ -22,5 +22,5 @@ target_link_libraries(snmpapi wine) add_importlibs(snmpapi msvcrt kernel32 ntdll) -add_cab_target(snmpapi 1) +add_cd_file(TARGET snmpapi DESTINATION reactos/system32) add_importlib_target(snmpapi.spec) diff --git a/dll/win32/softpub/CMakeLists.txt b/dll/win32/softpub/CMakeLists.txt index d2915a93779..35099be559c 100644 --- a/dll/win32/softpub/CMakeLists.txt +++ b/dll/win32/softpub/CMakeLists.txt @@ -13,4 +13,4 @@ target_link_libraries(softpub wine) add_importlibs(softpub wintrust) -add_cab_target(softpub 1) \ No newline at end of file +add_cd_file(TARGET softpub DESTINATION reactos/system32) \ No newline at end of file diff --git a/dll/win32/spoolss/CMakeLists.txt b/dll/win32/spoolss/CMakeLists.txt index a7ad5df883b..4bfcb8d8bc3 100644 --- a/dll/win32/spoolss/CMakeLists.txt +++ b/dll/win32/spoolss/CMakeLists.txt @@ -19,4 +19,4 @@ target_link_libraries(spoolss wine) add_importlibs(spoolss winspool msvcrt kernel32 ntdll) add_importlib_target(spoolss.spec) -add_cab_target(spoolss 1) +add_cd_file(TARGET spoolss DESTINATION reactos/system32) diff --git a/dll/win32/srclient/CMakeLists.txt b/dll/win32/srclient/CMakeLists.txt index 3692f75e1fc..08838613858 100644 --- a/dll/win32/srclient/CMakeLists.txt +++ b/dll/win32/srclient/CMakeLists.txt @@ -12,4 +12,4 @@ set_entrypoint(srclient 0) add_importlibs(srclient kernel32 ntdll) add_dependencies(srclient psdk) -add_cab_target(srclient 1) +add_cd_file(TARGET srclient DESTINATION reactos/system32) diff --git a/dll/win32/stdole2.tlb/CMakeLists.txt b/dll/win32/stdole2.tlb/CMakeLists.txt index 2c32ce8df82..bf38643415c 100644 --- a/dll/win32/stdole2.tlb/CMakeLists.txt +++ b/dll/win32/stdole2.tlb/CMakeLists.txt @@ -15,4 +15,4 @@ add_library(stdole2.tlb SHARED ${SOURCE}) set_entrypoint(stdole2.tlb 0) set_target_properties(stdole2.tlb PROPERTIES SUFFIX "") add_dependencies(stdole2.tlb std_ole_v2) -add_cab_target(stdole2.tlb 1) +add_cd_file(TARGET stdole2.tlb DESTINATION reactos/system32) diff --git a/dll/win32/stdole32.tlb/CMakeLists.txt b/dll/win32/stdole32.tlb/CMakeLists.txt index 72d75bdbb94..06850d64dc5 100644 --- a/dll/win32/stdole32.tlb/CMakeLists.txt +++ b/dll/win32/stdole32.tlb/CMakeLists.txt @@ -16,4 +16,4 @@ set_entrypoint(stdole32.tlb 0) set_target_properties(stdole32.tlb PROPERTIES SUFFIX "") add_dependencies(stdole32.tlb std_ole_v1) -add_cab_target(stdole32.tlb 1) +add_cd_file(TARGET stdole32.tlb DESTINATION reactos/system32) diff --git a/dll/win32/sti/CMakeLists.txt b/dll/win32/sti/CMakeLists.txt index c1c7fa6aa14..88ff61bd218 100644 --- a/dll/win32/sti/CMakeLists.txt +++ b/dll/win32/sti/CMakeLists.txt @@ -38,4 +38,4 @@ add_importlibs(sti kernel32 ntdll) -add_cab_target(sti 1) +add_cd_file(TARGET sti DESTINATION reactos/system32) diff --git a/dll/win32/sxs/CMakeLists.txt b/dll/win32/sxs/CMakeLists.txt index 5cdf08d64ef..6ce1359f414 100644 --- a/dll/win32/sxs/CMakeLists.txt +++ b/dll/win32/sxs/CMakeLists.txt @@ -17,4 +17,4 @@ target_link_libraries(sxs wine) add_importlibs(sxs kernel32 ntdll) add_dependencies(sxs psdk) -add_cab_target(sxs 1) +add_cd_file(TARGET sxs DESTINATION reactos/system32) diff --git a/dll/win32/syssetup/CMakeLists.txt b/dll/win32/syssetup/CMakeLists.txt index 9cc967b4dd3..08cd808e6ba 100644 --- a/dll/win32/syssetup/CMakeLists.txt +++ b/dll/win32/syssetup/CMakeLists.txt @@ -39,4 +39,4 @@ add_importlibs(syssetup ntdll) -add_cab_target(syssetup 1) +add_cd_file(TARGET syssetup DESTINATION reactos/system32) diff --git a/dll/win32/t2embed/CMakeLists.txt b/dll/win32/t2embed/CMakeLists.txt index 93bc2e74f54..41994f5d36d 100644 --- a/dll/win32/t2embed/CMakeLists.txt +++ b/dll/win32/t2embed/CMakeLists.txt @@ -19,4 +19,4 @@ target_link_libraries(t2embed wine) add_importlibs(t2embed gdi32 user32 advapi32 version msvcrt kernel32 ntdll) -add_cab_target(t2embed 1) +add_cd_file(TARGET t2embed DESTINATION reactos/system32) diff --git a/dll/win32/tapi32/CMakeLists.txt b/dll/win32/tapi32/CMakeLists.txt index 67e08061666..4ea7a61cc85 100644 --- a/dll/win32/tapi32/CMakeLists.txt +++ b/dll/win32/tapi32/CMakeLists.txt @@ -21,4 +21,4 @@ target_link_libraries(tapi32 wine) add_importlibs(tapi32 advapi32 kernel32 ntdll) add_dependencies(tapi32 psdk) -add_cab_target(tapi32 1) +add_cd_file(TARGET tapi32 DESTINATION reactos/system32) diff --git a/dll/win32/tapiui/CMakeLists.txt b/dll/win32/tapiui/CMakeLists.txt index c24b27ddce9..d6c38c681bd 100644 --- a/dll/win32/tapiui/CMakeLists.txt +++ b/dll/win32/tapiui/CMakeLists.txt @@ -4,4 +4,4 @@ set_rc_compiler() add_library(tapiui SHARED tapiui.rc) set_entrypoint(tapiui 0) add_dependencies(tapiui psdk) -add_cab_target(tapiui 1) +add_cd_file(TARGET tapiui DESTINATION reactos/system32) diff --git a/dll/win32/traffic/CMakeLists.txt b/dll/win32/traffic/CMakeLists.txt index 3ed8580638c..1faf215dd3c 100644 --- a/dll/win32/traffic/CMakeLists.txt +++ b/dll/win32/traffic/CMakeLists.txt @@ -17,4 +17,4 @@ target_link_libraries(traffic wine) add_importlibs(traffic msvcrt kernel32 ntdll) add_dependencies(traffic psdk) -add_cab_target(traffic 1) +add_cd_file(TARGET traffic DESTINATION reactos/system32) diff --git a/dll/win32/twain_32/CMakeLists.txt b/dll/win32/twain_32/CMakeLists.txt index a99d4a06f6f..93215bf7138 100644 --- a/dll/win32/twain_32/CMakeLists.txt +++ b/dll/win32/twain_32/CMakeLists.txt @@ -18,4 +18,4 @@ add_library(twain_32 SHARED ${SOURCE}) set_module_type(twain_32 win32dll) target_link_libraries(twain_32 wine) add_importlibs(twain_32 msvcrt kernel32 ntdll) -add_cab_target(twain_32 1) +add_cd_file(TARGET twain_32 DESTINATION reactos/system32) diff --git a/dll/win32/uext2/CMakeLists.txt b/dll/win32/uext2/CMakeLists.txt index 624d7e2cfe8..9b3b16fb347 100644 --- a/dll/win32/uext2/CMakeLists.txt +++ b/dll/win32/uext2/CMakeLists.txt @@ -11,4 +11,4 @@ add_library(uext2 SHARED ${SOURCE}) set_module_type(uext2 win32dll) target_link_libraries(uext2 ext2lib) add_importlibs(uext2 msvcrt kernel32 ntdll) -add_cab_target(uext2 1) +add_cd_file(TARGET uext2 DESTINATION reactos/system32) diff --git a/dll/win32/ufat/CMakeLists.txt b/dll/win32/ufat/CMakeLists.txt index 6c40b68cea4..31d1f8c0067 100644 --- a/dll/win32/ufat/CMakeLists.txt +++ b/dll/win32/ufat/CMakeLists.txt @@ -11,4 +11,4 @@ add_library(ufat SHARED ${SOURCE}) set_module_type(ufat win32dll) target_link_libraries(ufat vfatlib) add_importlibs(ufat msvcrt kernel32 ntdll) -add_cab_target(ufat 1) +add_cd_file(TARGET ufat DESTINATION reactos/system32) diff --git a/dll/win32/ufatx/CMakeLists.txt b/dll/win32/ufatx/CMakeLists.txt index 79b262b89e8..78935ae3199 100644 --- a/dll/win32/ufatx/CMakeLists.txt +++ b/dll/win32/ufatx/CMakeLists.txt @@ -13,4 +13,4 @@ target_link_libraries(ufatx vfatxlib -lgcc) add_importlibs(ufatx kernel32 ntdll) add_importlib_target(ufatx.spec) add_dependencies(ufatx psdk) -add_cab_target(ufatx 1) +add_cd_file(TARGET ufatx DESTINATION reactos/system32) diff --git a/dll/win32/unicows/CMakeLists.txt b/dll/win32/unicows/CMakeLists.txt index e9e4f79a38e..538026d7df0 100644 --- a/dll/win32/unicows/CMakeLists.txt +++ b/dll/win32/unicows/CMakeLists.txt @@ -26,4 +26,4 @@ add_importlibs(unicows advapi32 kernel32 ntdll) -add_cab_target(unicows 1) +add_cd_file(TARGET unicows DESTINATION reactos/system32) diff --git a/dll/win32/untfs/CMakeLists.txt b/dll/win32/untfs/CMakeLists.txt index 88094935bbd..18eee6abe07 100644 --- a/dll/win32/untfs/CMakeLists.txt +++ b/dll/win32/untfs/CMakeLists.txt @@ -11,4 +11,4 @@ add_library(untfs SHARED ${SOURCE}) set_module_type(untfs win32dll) target_link_libraries(untfs ntfslib) add_importlibs(untfs msvcrt kernel32 ntdll) -add_cab_target(untfs 1) +add_cd_file(TARGET untfs DESTINATION reactos/system32) diff --git a/dll/win32/updspapi/CMakeLists.txt b/dll/win32/updspapi/CMakeLists.txt index ca28359f3ed..56df8904e52 100644 --- a/dll/win32/updspapi/CMakeLists.txt +++ b/dll/win32/updspapi/CMakeLists.txt @@ -17,4 +17,4 @@ target_link_libraries(updspapi wine) add_importlibs(updspapi setupapi kernel32 ntdll) add_dependencies(updspapi psdk) -add_cab_target(updspapi 1) +add_cd_file(TARGET updspapi DESTINATION reactos/system32) diff --git a/dll/win32/url/CMakeLists.txt b/dll/win32/url/CMakeLists.txt index c98d150d208..35f80a0a641 100644 --- a/dll/win32/url/CMakeLists.txt +++ b/dll/win32/url/CMakeLists.txt @@ -17,4 +17,4 @@ target_link_libraries(url wine) add_importlibs(url shell32 shlwapi msvcrt kernel32 ntdll) -add_cab_target(url 1) +add_cd_file(TARGET url DESTINATION reactos/system32) diff --git a/dll/win32/urlmon/CMakeLists.txt b/dll/win32/urlmon/CMakeLists.txt index bb50265e14f..451bfd3effc 100644 --- a/dll/win32/urlmon/CMakeLists.txt +++ b/dll/win32/urlmon/CMakeLists.txt @@ -72,5 +72,5 @@ add_definitions( add_definitions(-DPROXY_CLSID_IS="{0x79EAC9F1,0xBAF9,0x11CE,{0x8C,0x82,0x00,0xAA,0x00,0x4B,0xA9,0x0B}}") -add_cab_target(urlmon 1) +add_cd_file(TARGET urlmon DESTINATION reactos/system32) add_importlib_target(urlmon.spec) diff --git a/dll/win32/user32/CMakeLists.txt b/dll/win32/user32/CMakeLists.txt index 53293f8a18f..486b8c7e4d3 100644 --- a/dll/win32/user32/CMakeLists.txt +++ b/dll/win32/user32/CMakeLists.txt @@ -80,5 +80,5 @@ target_link_libraries(user32 add_pch(user32 ${CMAKE_CURRENT_SOURCE_DIR}/include/user32.h ${SOURCE}) add_importlibs(user32 gdi32 advapi32 imm32 msvcrt kernel32 ntdll) -add_cab_target(user32 1) +add_cd_file(TARGET user32 DESTINATION reactos/system32) add_importlib_target(user32.spec) diff --git a/dll/win32/userenv/CMakeLists.txt b/dll/win32/userenv/CMakeLists.txt index 513c911f1b4..1a92291fdbd 100644 --- a/dll/win32/userenv/CMakeLists.txt +++ b/dll/win32/userenv/CMakeLists.txt @@ -28,5 +28,5 @@ target_link_libraries(userenv uuid) add_importlibs(userenv advapi32 user32 msvcrt kernel32 ntdll) add_pch(userenv ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) -add_cab_target(userenv 1) +add_cd_file(TARGET userenv DESTINATION reactos/system32) add_importlib_target(userenv.spec) diff --git a/dll/win32/usp10/CMakeLists.txt b/dll/win32/usp10/CMakeLists.txt index 1f385e85d76..0dbbe3e7ae6 100644 --- a/dll/win32/usp10/CMakeLists.txt +++ b/dll/win32/usp10/CMakeLists.txt @@ -22,4 +22,4 @@ target_link_libraries(usp10 wine) add_importlibs(usp10 gdi32 msvcrt kernel32 ntdll) add_importlib_target(usp10.spec) -add_cab_target(usp10 1) +add_cd_file(TARGET usp10 DESTINATION reactos/system32) diff --git a/dll/win32/uxtheme/CMakeLists.txt b/dll/win32/uxtheme/CMakeLists.txt index e745bcff013..45fe0436774 100644 --- a/dll/win32/uxtheme/CMakeLists.txt +++ b/dll/win32/uxtheme/CMakeLists.txt @@ -27,5 +27,5 @@ target_link_libraries(uxtheme wine) add_importlibs(uxtheme user32 advapi32 gdi32 msimg32 msvcrt kernel32 ntdll) -add_cab_target(uxtheme 1) +add_cd_file(TARGET uxtheme DESTINATION reactos/system32) add_importlib_target(uxtheme.spec) diff --git a/dll/win32/vdmdbg/CMakeLists.txt b/dll/win32/vdmdbg/CMakeLists.txt index ddc994f8b7e..0f546eee456 100644 --- a/dll/win32/vdmdbg/CMakeLists.txt +++ b/dll/win32/vdmdbg/CMakeLists.txt @@ -14,4 +14,4 @@ add_library(vdmdbg SHARED set_module_type(vdmdbg win32dll) add_importlibs(vdmdbg msvcrt kernel32 ntdll) add_pch(vdmdbg ${CMAKE_CURRENT_SOURCE_DIR}/vdmdbg.h ${SOURCE}) -add_cab_target(vdmdbg 1) +add_cd_file(TARGET vdmdbg DESTINATION reactos/system32) diff --git a/dll/win32/version/CMakeLists.txt b/dll/win32/version/CMakeLists.txt index 98df5fa31b8..f5d94e02721 100644 --- a/dll/win32/version/CMakeLists.txt +++ b/dll/win32/version/CMakeLists.txt @@ -18,5 +18,5 @@ set_entrypoint(version 0) target_link_libraries(version wine) add_importlibs(version lz32 kernel32 ntdll) add_dependencies(version psdk) -add_cab_target(version 1) +add_cd_file(TARGET version DESTINATION reactos/system32) add_importlib_target(version.spec) diff --git a/dll/win32/wdmaud.drv/CMakeLists.txt b/dll/win32/wdmaud.drv/CMakeLists.txt index b1a3e2c7eef..b8784cac684 100644 --- a/dll/win32/wdmaud.drv/CMakeLists.txt +++ b/dll/win32/wdmaud.drv/CMakeLists.txt @@ -31,4 +31,4 @@ target_link_libraries(wdmaud.drv mmixer) add_importlibs(wdmaud.drv user32 winmm advapi32 msvcrt setupapi ksuser kernel32 ntdll) -add_cab_target(wdmaud.drv 1) +add_cd_file(TARGET wdmaud.drv DESTINATION reactos/system32) diff --git a/dll/win32/windowscodecs/CMakeLists.txt b/dll/win32/windowscodecs/CMakeLists.txt index 2d271c2813d..bb71c44bf54 100644 --- a/dll/win32/windowscodecs/CMakeLists.txt +++ b/dll/win32/windowscodecs/CMakeLists.txt @@ -46,4 +46,4 @@ target_link_libraries(windowscodecs wine uuid) add_importlibs(windowscodecs ole32 shlwapi advapi32 msvcrt kernel32 ntdll) add_importlib_target(windowscodecs.spec) -add_cab_target(windowscodecs 1) +add_cd_file(TARGET windowscodecs DESTINATION reactos/system32) diff --git a/dll/win32/winemp3.acm/CMakeLists.txt b/dll/win32/winemp3.acm/CMakeLists.txt index f2eada4edbe..bfd0766ccd2 100644 --- a/dll/win32/winemp3.acm/CMakeLists.txt +++ b/dll/win32/winemp3.acm/CMakeLists.txt @@ -31,4 +31,4 @@ add_importlibs(winemp3.acm add_dependencies(winemp3.acm psdk) -add_cab_target(winemp3.acm 1) \ No newline at end of file +add_cd_file(TARGET winemp3.acm DESTINATION reactos/system32) \ No newline at end of file diff --git a/dll/win32/winfax/CMakeLists.txt b/dll/win32/winfax/CMakeLists.txt index 9d466ac21ab..586c8e8368c 100644 --- a/dll/win32/winfax/CMakeLists.txt +++ b/dll/win32/winfax/CMakeLists.txt @@ -12,4 +12,4 @@ set_entrypoint(winfax 0) add_importlibs(winfax kernel32 ntdll) add_dependencies(winfax psdk) -add_cab_target(winfax 1) +add_cd_file(TARGET winfax DESTINATION reactos/system32) diff --git a/dll/win32/wing32/CMakeLists.txt b/dll/win32/wing32/CMakeLists.txt index 03aedd4f53d..77e5f7c368a 100644 --- a/dll/win32/wing32/CMakeLists.txt +++ b/dll/win32/wing32/CMakeLists.txt @@ -13,4 +13,4 @@ set_entrypoint(wing32 0) add_importlibs(wing32 user32 gdi32 msvcrt) add_dependencies(wing32 psdk) -add_cab_target(wing32 1) +add_cd_file(TARGET wing32 DESTINATION reactos/system32) diff --git a/dll/win32/winhttp/CMakeLists.txt b/dll/win32/winhttp/CMakeLists.txt index ddd3ca8c8ef..cea7b1dff4e 100644 --- a/dll/win32/winhttp/CMakeLists.txt +++ b/dll/win32/winhttp/CMakeLists.txt @@ -20,4 +20,4 @@ set_module_type(winhttp win32dll) target_link_libraries(winhttp wine) add_importlibs(winhttp shlwapi wininet ws2_32 msvcrt crypt32 advapi32 kernel32 ntdll) add_importlib_target(winhttp.spec) -add_cab_target(winhttp 1) +add_cd_file(TARGET winhttp DESTINATION reactos/system32) diff --git a/dll/win32/wininet/CMakeLists.txt b/dll/win32/wininet/CMakeLists.txt index 8beeff2b603..0dd681b938f 100644 --- a/dll/win32/wininet/CMakeLists.txt +++ b/dll/win32/wininet/CMakeLists.txt @@ -33,5 +33,5 @@ target_link_libraries(wininet wine ${PSEH_LIB}) add_importlibs(wininet mpr shlwapi shell32 user32 advapi32 secur32 crypt32 ws2_32 msvcrt kernel32 ntdll) -add_cab_target(wininet 1) +add_cd_file(TARGET wininet DESTINATION reactos/system32) add_importlib_target(wininet.spec) diff --git a/dll/win32/winmm/CMakeLists.txt b/dll/win32/winmm/CMakeLists.txt index 4bbc5885639..fa338f60314 100644 --- a/dll/win32/winmm/CMakeLists.txt +++ b/dll/win32/winmm/CMakeLists.txt @@ -32,5 +32,5 @@ add_importlibs(winmm advapi32 user32 msvcrt kernel32 ntdll) add_subdirectory(midimap) -add_cab_target(winmm 1) +add_cd_file(TARGET winmm DESTINATION reactos/system32) add_importlib_target(winmm.spec) diff --git a/dll/win32/winmm/midimap/CMakeLists.txt b/dll/win32/winmm/midimap/CMakeLists.txt index 84c41bcf852..8589e472aa6 100644 --- a/dll/win32/winmm/midimap/CMakeLists.txt +++ b/dll/win32/winmm/midimap/CMakeLists.txt @@ -14,5 +14,5 @@ target_link_libraries(midimap uuid wine) add_importlibs(midimap advapi32 user32 winmm kernel32 ntdll) add_dependencies(midimap psdk) -add_cab_target(midimap 1) +add_cd_file(TARGET midimap DESTINATION reactos/system32) diff --git a/dll/win32/winspool/CMakeLists.txt b/dll/win32/winspool/CMakeLists.txt index a6fa8b6ea04..47ce591e717 100644 --- a/dll/win32/winspool/CMakeLists.txt +++ b/dll/win32/winspool/CMakeLists.txt @@ -21,5 +21,5 @@ set_target_properties(winspool PROPERTIES SUFFIX ".drv") set_module_type(winspool win32dll) target_link_libraries(winspool wine) add_importlibs(winspool advapi32 shlwapi msvcrt kernel32 ntdll) -add_cab_target(winspool 1) +add_cd_file(TARGET winspool DESTINATION reactos/system32) add_importlib_target(winspool.spec) diff --git a/dll/win32/winsta/CMakeLists.txt b/dll/win32/winsta/CMakeLists.txt index c4c04d4cba5..eb21d9481da 100644 --- a/dll/win32/winsta/CMakeLists.txt +++ b/dll/win32/winsta/CMakeLists.txt @@ -20,4 +20,4 @@ set_module_type(winsta win32dll) target_link_libraries(winsta wine) add_importlibs(winsta msvcrt kernel32 ntdll) add_pch(winsta ${CMAKE_CURRENT_SOURCE_DIR}/winsta.h ${SOURCE}) -add_cab_target(winsta 1) +add_cd_file(TARGET winsta DESTINATION reactos/system32) diff --git a/dll/win32/wintrust/CMakeLists.txt b/dll/win32/wintrust/CMakeLists.txt index f433a1cc8a6..a75d7a8f474 100644 --- a/dll/win32/wintrust/CMakeLists.txt +++ b/dll/win32/wintrust/CMakeLists.txt @@ -27,5 +27,5 @@ add_importlibs(wintrust crypt32 cryptui user32 advapi32 imagehlp msvcrt kernel32 add_importlib_target(wintrust.spec) -add_cab_target(wintrust 1) +add_cd_file(TARGET wintrust DESTINATION reactos/system32) diff --git a/dll/win32/wlanapi/CMakeLists.txt b/dll/win32/wlanapi/CMakeLists.txt index 708b17db377..2e72d164802 100644 --- a/dll/win32/wlanapi/CMakeLists.txt +++ b/dll/win32/wlanapi/CMakeLists.txt @@ -21,4 +21,4 @@ add_importlibs(wlanapi rpcrt4 kernel32 ntdll) add_importlib_target(wlanapi.spec) add_dependencies(wlanapi psdk) -add_cab_target(wlanapi 1) +add_cd_file(TARGET wlanapi DESTINATION reactos/system32) diff --git a/dll/win32/wldap32/CMakeLists.txt b/dll/win32/wldap32/CMakeLists.txt index da88ae89705..dff052ec6c7 100644 --- a/dll/win32/wldap32/CMakeLists.txt +++ b/dll/win32/wldap32/CMakeLists.txt @@ -38,4 +38,4 @@ target_link_libraries(wldap32 wine) add_importlibs(wldap32 user32 msvcrt kernel32 ntdll) add_importlib_target(wldap32.spec) -add_cab_target(wldap32 1) +add_cd_file(TARGET wldap32 DESTINATION reactos/system32) diff --git a/dll/win32/wmi/CMakeLists.txt b/dll/win32/wmi/CMakeLists.txt index 34ea2fdd661..6fbefdd27e5 100644 --- a/dll/win32/wmi/CMakeLists.txt +++ b/dll/win32/wmi/CMakeLists.txt @@ -11,4 +11,4 @@ set_entrypoint(wmi 0) add_importlibs(wmi advapi32) add_dependencies(wmi psdk) -add_cab_target(wmi 1) +add_cd_file(TARGET wmi DESTINATION reactos/system32) diff --git a/dll/win32/ws2_32/CMakeLists.txt b/dll/win32/ws2_32/CMakeLists.txt index 34218b2dc52..9e4e8e646b2 100644 --- a/dll/win32/ws2_32/CMakeLists.txt +++ b/dll/win32/ws2_32/CMakeLists.txt @@ -32,5 +32,5 @@ target_link_libraries(ws2_32 wine) add_importlibs(ws2_32 user32 advapi32 dnsapi ws2help msvcrt kernel32 ntdll) add_pch(ws2_32 ${CMAKE_CURRENT_SOURCE_DIR}/include/ws2_32.h ${SOURCE}) -add_cab_target(ws2_32 1) +add_cd_file(TARGET ws2_32 DESTINATION reactos/system32) add_importlib_target(ws2_32.spec) diff --git a/dll/win32/ws2_32_new/CMakeLists.txt b/dll/win32/ws2_32_new/CMakeLists.txt index bf03fb499b5..d1e8fa5dd6f 100644 --- a/dll/win32/ws2_32_new/CMakeLists.txt +++ b/dll/win32/ws2_32_new/CMakeLists.txt @@ -52,4 +52,4 @@ add_library(ws2_32_new SHARED ${SOURCE}) set_module_type(ws2_32_new win32dll) target_link_libraries(ws2_32_new wine) add_importlibs(ws2_32_new user32 advapi32 dnsapi ws2help msvcrt kernel32 ntdll) -add_cab_target(ws2_32_new 1) +add_cd_file(TARGET ws2_32_new DESTINATION reactos/system32) diff --git a/dll/win32/ws2help/CMakeLists.txt b/dll/win32/ws2help/CMakeLists.txt index 15c4c2a886f..51f0c99361a 100644 --- a/dll/win32/ws2help/CMakeLists.txt +++ b/dll/win32/ws2help/CMakeLists.txt @@ -15,5 +15,5 @@ add_library(ws2help SHARED ${SOURCE}) set_module_type(ws2help win32dll) add_importlibs(ws2help advapi32 ws2_32 msvcrt kernel32 ntdll) -add_cab_target(ws2help 1) +add_cd_file(TARGET ws2help DESTINATION reactos/system32) add_importlib_target(ws2help.spec) diff --git a/dll/win32/wshirda/CMakeLists.txt b/dll/win32/wshirda/CMakeLists.txt index ca6ab12e09f..26420ea2275 100644 --- a/dll/win32/wshirda/CMakeLists.txt +++ b/dll/win32/wshirda/CMakeLists.txt @@ -12,4 +12,4 @@ add_library(wshirda SHARED ${SOURCE}) set_module_type(wshirda win32dll) add_importlibs(wshirda ws2_32 msvcrt kernel32 ntdll) -add_cab_target(wshirda 1) +add_cd_file(TARGET wshirda DESTINATION reactos/system32) diff --git a/dll/win32/wshtcpip/CMakeLists.txt b/dll/win32/wshtcpip/CMakeLists.txt index 95ee1824b7d..1f1664f9837 100644 --- a/dll/win32/wshtcpip/CMakeLists.txt +++ b/dll/win32/wshtcpip/CMakeLists.txt @@ -17,4 +17,4 @@ set_entrypoint(wshtcpip 0) target_link_libraries(wshtcpip tdilib) add_importlibs(wshtcpip ws2_32 kernel32 ntdll) add_dependencies(wshtcpip psdk) -add_cab_target(wshtcpip 1) +add_cd_file(TARGET wshtcpip DESTINATION reactos/system32) diff --git a/dll/win32/wsock32/CMakeLists.txt b/dll/win32/wsock32/CMakeLists.txt index 543e9749329..af74bb34d7d 100644 --- a/dll/win32/wsock32/CMakeLists.txt +++ b/dll/win32/wsock32/CMakeLists.txt @@ -7,4 +7,4 @@ add_library(wsock32 SHARED stubs.c wsock32.rc wsock32.def ${CMAKE_CURRENT_BINARY set_module_type(wsock32 win32dll) add_importlibs(wsock32 mswsock ws2_32 msvcrt kernel32 ntdll) -add_cab_target(wsock32 1) +add_cd_file(TARGET wsock32 DESTINATION reactos/system32) diff --git a/dll/win32/wtsapi32/CMakeLists.txt b/dll/win32/wtsapi32/CMakeLists.txt index abc1de6c6e6..0001130981a 100644 --- a/dll/win32/wtsapi32/CMakeLists.txt +++ b/dll/win32/wtsapi32/CMakeLists.txt @@ -17,4 +17,4 @@ target_link_libraries(wtsapi32 wine) add_importlibs(wtsapi32 advapi32 msvcrt kernel32 ntdll) -add_cab_target(wtsapi32 1) +add_cd_file(TARGET wtsapi32 DESTINATION reactos/system32) diff --git a/dll/win32/wuapi/CMakeLists.txt b/dll/win32/wuapi/CMakeLists.txt index 19fe67002ce..a1062ac209a 100644 --- a/dll/win32/wuapi/CMakeLists.txt +++ b/dll/win32/wuapi/CMakeLists.txt @@ -25,4 +25,4 @@ add_library(wuapi SHARED ${SOURCE}) set_module_type(wuapi win32dll) target_link_libraries(wuapi uuid wine wuguid) add_importlibs(wuapi ole32 advapi32 msvcrt kernel32 ntdll) -add_cab_target(wuapi 1) +add_cd_file(TARGET wuapi DESTINATION reactos/system32) diff --git a/dll/win32/xinput1_1/CMakeLists.txt b/dll/win32/xinput1_1/CMakeLists.txt index 24bd1d571fb..71bb645cce7 100644 --- a/dll/win32/xinput1_1/CMakeLists.txt +++ b/dll/win32/xinput1_1/CMakeLists.txt @@ -13,4 +13,4 @@ add_library(xinput1_1 SHARED ${SOURCE}) set_module_type(xinput1_1 win32dll) add_importlibs(xinput1_1 msvcrt kernel32 xinput1_3) -add_cab_target(xinput1_1 1) +add_cd_file(TARGET xinput1_1 DESTINATION reactos/system32) diff --git a/dll/win32/xinput1_2/CMakeLists.txt b/dll/win32/xinput1_2/CMakeLists.txt index ab02343a360..95611323c5d 100644 --- a/dll/win32/xinput1_2/CMakeLists.txt +++ b/dll/win32/xinput1_2/CMakeLists.txt @@ -13,4 +13,4 @@ add_library(xinput1_2 SHARED ${SOURCE}) set_module_type(xinput1_2 win32dll) add_importlibs(xinput1_2 msvcrt kernel32 xinput1_3) -add_cab_target(xinput1_2 1) +add_cd_file(TARGET xinput1_2 DESTINATION reactos/system32) diff --git a/dll/win32/xinput1_3/CMakeLists.txt b/dll/win32/xinput1_3/CMakeLists.txt index c245de9cf80..6af5a89b649 100644 --- a/dll/win32/xinput1_3/CMakeLists.txt +++ b/dll/win32/xinput1_3/CMakeLists.txt @@ -15,4 +15,4 @@ add_importlib_target(xinput1_3.spec) set_module_type(xinput1_3 win32dll) target_link_libraries(xinput1_3 wine) add_importlibs(xinput1_3 msvcrt kernel32 ntdll) -add_cab_target(xinput1_3 1) +add_cd_file(TARGET xinput1_3 DESTINATION reactos/system32) diff --git a/dll/win32/xinput9_1_0/CMakeLists.txt b/dll/win32/xinput9_1_0/CMakeLists.txt index 1d1efc01eef..78c4b628f3b 100644 --- a/dll/win32/xinput9_1_0/CMakeLists.txt +++ b/dll/win32/xinput9_1_0/CMakeLists.txt @@ -13,4 +13,4 @@ add_library(xinput9_1_0 SHARED ${SOURCE}) set_module_type(xinput9_1_0 win32dll) add_importlibs(xinput9_1_0 msvcrt kernel32 xinput1_3) -add_cab_target(xinput9_1_0 1) +add_cd_file(TARGET xinput9_1_0 DESTINATION reactos/system32) diff --git a/dll/win32/xmllite/CMakeLists.txt b/dll/win32/xmllite/CMakeLists.txt index 6849239ccce..a1b14a88844 100644 --- a/dll/win32/xmllite/CMakeLists.txt +++ b/dll/win32/xmllite/CMakeLists.txt @@ -19,4 +19,4 @@ target_link_libraries(xmllite wine uuid) add_importlibs(xmllite msvcrt kernel32 ntdll) add_importlib_target(xmllite.spec) -add_cab_target(xmllite 1) +add_cd_file(TARGET xmllite DESTINATION reactos/system32) diff --git a/drivers/base/beep/CMakeLists.txt b/drivers/base/beep/CMakeLists.txt index 8b88456e1e7..9b72db98aa2 100644 --- a/drivers/base/beep/CMakeLists.txt +++ b/drivers/base/beep/CMakeLists.txt @@ -2,4 +2,4 @@ add_library(beep SHARED beep.c beep.rc) set_module_type(beep kernelmodedriver) add_importlibs(beep ntoskrnl hal) -add_cab_target(beep 2) +add_cd_file(TARGET beep DESTINATION reactos/system32/drivers) diff --git a/drivers/base/bootvid/CMakeLists.txt b/drivers/base/bootvid/CMakeLists.txt index 685ddb15637..00ec744e96b 100644 --- a/drivers/base/bootvid/CMakeLists.txt +++ b/drivers/base/bootvid/CMakeLists.txt @@ -25,6 +25,5 @@ set_image_base(bootvid 0x00010000) add_importlibs(bootvid ntoskrnl hal) add_pch(bootvid ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) add_dependencies(bootvid psdk bugcodes) -add_minicd_target(bootvid reactos bootvid.dll) -add_cab_target(bootvid 1) +add_cd_file(TARGET bootvid DESTINATION reactos/system32 NO_CAB) add_importlib_target(bootvid.spec) diff --git a/drivers/base/kdcom/CMakeLists.txt b/drivers/base/kdcom/CMakeLists.txt index b2a5dca3aa4..1ba29092864 100644 --- a/drivers/base/kdcom/CMakeLists.txt +++ b/drivers/base/kdcom/CMakeLists.txt @@ -19,6 +19,5 @@ set_image_base(kdcom 0x00010000) add_importlibs(kdcom ntoskrnl hal) add_dependencies(kdcom psdk bugcodes) -add_minicd_target(kdcom reactos kdcom.dll) -add_livecd_target(kdcom reactos/system32) +add_cd_file(TARGET kdcom DESTINATION reactos/system32 NO_CAB) add_importlib_target(kdcom.spec) diff --git a/drivers/base/nmidebug/CMakeLists.txt b/drivers/base/nmidebug/CMakeLists.txt index c81702260f6..79fd7a4a649 100644 --- a/drivers/base/nmidebug/CMakeLists.txt +++ b/drivers/base/nmidebug/CMakeLists.txt @@ -4,5 +4,4 @@ add_library(nmidebug SHARED nmidebug.c nmidebug.rc) set_module_type(nmidebug kernelmodedriver) add_importlibs(nmidebug ntoskrnl hal) -add_minicd_target(nmidebug reactos) -add_cab_target(nmidebug 2) +add_cd_file(TARGET nmidebug DESTINATION reactos/system32/drivers NO_CAB) diff --git a/drivers/base/null/CMakeLists.txt b/drivers/base/null/CMakeLists.txt index 0130b33fdcb..48d1cdc6482 100644 --- a/drivers/base/null/CMakeLists.txt +++ b/drivers/base/null/CMakeLists.txt @@ -6,4 +6,4 @@ target_link_libraries(null ${PSEH_LIB}) set_module_type(null kernelmodedriver) add_importlibs(null ntoskrnl hal) -add_cab_target(null 2) +add_cd_file(TARGET null DESTINATION reactos/system32/drivers) diff --git a/drivers/battery/battc/CMakeLists.txt b/drivers/battery/battc/CMakeLists.txt index 3bf4580b134..7ec595b277d 100644 --- a/drivers/battery/battc/CMakeLists.txt +++ b/drivers/battery/battc/CMakeLists.txt @@ -11,5 +11,5 @@ add_library(battc SHARED set_module_type(battc kernelmodedriver) add_importlibs(battc ntoskrnl hal) -add_cab_target(battc 2) +add_cd_file(TARGET battc DESTINATION reactos/system32/drivers) add_importlib_target(battc.spec) diff --git a/drivers/bus/acpi/CMakeLists.txt b/drivers/bus/acpi/CMakeLists.txt index 0dfc388c978..e774fe72100 100644 --- a/drivers/bus/acpi/CMakeLists.txt +++ b/drivers/bus/acpi/CMakeLists.txt @@ -147,8 +147,7 @@ target_link_libraries(acpi add_importlibs(acpi ntoskrnl hal) -add_minicd_target(acpi reactos acpi.sys) -add_livecd_target(acpi reactos/system32/drivers) +add_cd_file(TARGET acpi DESTINATION reactos/system32/drivers NO_CAB) add_subdirectory(cmbatt) add_subdirectory(compbatt) diff --git a/drivers/bus/acpi/cmbatt/CMakeLists.txt b/drivers/bus/acpi/cmbatt/CMakeLists.txt index 751d84d27ff..fc49764e6dd 100644 --- a/drivers/bus/acpi/cmbatt/CMakeLists.txt +++ b/drivers/bus/acpi/cmbatt/CMakeLists.txt @@ -14,4 +14,4 @@ add_importlibs(cmbatt ntoskrnl hal battc wmilib) add_pch(cmbatt ${CMAKE_CURRENT_SOURCE_DIR}/cmbatt.h ${SOURCE}) -add_cab_target(cmbatt 2) \ No newline at end of file +add_cd_file(TARGET cmbatt DESTINATION reactos/system32/drivers) \ No newline at end of file diff --git a/drivers/bus/acpi/compbatt/CMakeLists.txt b/drivers/bus/acpi/compbatt/CMakeLists.txt index b985c6d16ab..fd9f07561d4 100644 --- a/drivers/bus/acpi/compbatt/CMakeLists.txt +++ b/drivers/bus/acpi/compbatt/CMakeLists.txt @@ -12,4 +12,4 @@ add_importlibs(compbatt ntoskrnl hal battc) add_pch(compbatt ${CMAKE_CURRENT_SOURCE_DIR}/compbatt.h ${SOURCE}) -add_cab_target(compbatt 2) \ No newline at end of file +add_cd_file(TARGET compbatt DESTINATION reactos/system32/drivers) \ No newline at end of file diff --git a/drivers/bus/isapnp/CMakeLists.txt b/drivers/bus/isapnp/CMakeLists.txt index 509ba189f0d..120e4ab1359 100644 --- a/drivers/bus/isapnp/CMakeLists.txt +++ b/drivers/bus/isapnp/CMakeLists.txt @@ -9,5 +9,4 @@ add_library(isapnp SHARED set_module_type(isapnp kernelmodedriver) add_importlibs(isapnp ntoskrnl hal) -add_minicd_target(isapnp reactos isapnp.sys) -add_livecd_target(isapnp reactos/system32/drivers) +add_cd_file(TARGET isapnp DESTINATION reactos/system32/drivers NO_CAB) diff --git a/drivers/bus/pci/CMakeLists.txt b/drivers/bus/pci/CMakeLists.txt index 0fe7e241b27..901f91b9944 100644 --- a/drivers/bus/pci/CMakeLists.txt +++ b/drivers/bus/pci/CMakeLists.txt @@ -8,5 +8,4 @@ add_library(pci SHARED set_module_type(pci kernelmodedriver) add_importlibs(pci ntoskrnl hal) -add_minicd_target(pci reactos pci.sys) -add_livecd_target(pci reactos/system32/drivers) +add_cd_file(TARGET pci DESTINATION reactos/system32/drivers NO_CAB) diff --git a/drivers/bus/pcix/CMakeLists.txt b/drivers/bus/pcix/CMakeLists.txt index c40008c4fd0..7771b0e9afd 100644 --- a/drivers/bus/pcix/CMakeLists.txt +++ b/drivers/bus/pcix/CMakeLists.txt @@ -43,3 +43,5 @@ add_importlibs(pcix ntoskrnl hal) add_pch(pcix ${CMAKE_CURRENT_SOURCE_DIR}/pci.h ${SOURCE}) add_dependencies(pcix pciclass) + +add_cd_file(TARGET pcix DESTINATION reactos/system32/drivers NO_CAB) diff --git a/drivers/bus/pcmcia/CMakeLists.txt b/drivers/bus/pcmcia/CMakeLists.txt index 764b84a8dc4..3988b009807 100644 --- a/drivers/bus/pcmcia/CMakeLists.txt +++ b/drivers/bus/pcmcia/CMakeLists.txt @@ -8,5 +8,4 @@ add_library(pcmcia SHARED set_module_type(pcmcia kernelmodedriver) add_importlibs(pcmcia ntoskrnl hal) -add_minicd_target(pcmcia reactos pcmcia.sys) -add_livecd_target(pcmcia reactos/system32/drivers) +add_cd_file(TARGET pcmcia DESTINATION reactos/system32/drivers NO_CAB) diff --git a/drivers/directx/dxapi/CMakeLists.txt b/drivers/directx/dxapi/CMakeLists.txt index dda56228703..904a76ccb70 100644 --- a/drivers/directx/dxapi/CMakeLists.txt +++ b/drivers/directx/dxapi/CMakeLists.txt @@ -11,4 +11,4 @@ add_library(dxapi SHARED set_module_type(dxapi kernelmodedriver) add_importlibs(dxapi ntoskrnl hal videoprt) -add_cab_target(dxapi 2) \ No newline at end of file +add_cd_file(TARGET dxapi DESTINATION reactos/system32/drivers) \ No newline at end of file diff --git a/drivers/directx/dxg/CMakeLists.txt b/drivers/directx/dxg/CMakeLists.txt index c142278e634..bc7c8d5750c 100644 --- a/drivers/directx/dxg/CMakeLists.txt +++ b/drivers/directx/dxg/CMakeLists.txt @@ -12,4 +12,4 @@ add_library(dxg SHARED set_module_type(dxg kernelmodedriver) add_importlibs(dxg dxgthk ntoskrnl) -add_cab_target(dxg 2) \ No newline at end of file +add_cd_file(TARGET dxg DESTINATION reactos/system32/drivers) \ No newline at end of file diff --git a/drivers/directx/dxgthk/CMakeLists.txt b/drivers/directx/dxgthk/CMakeLists.txt index 3e414315a43..be743733a79 100644 --- a/drivers/directx/dxgthk/CMakeLists.txt +++ b/drivers/directx/dxgthk/CMakeLists.txt @@ -13,4 +13,4 @@ set_module_type(dxgthk kernelmodedriver) add_importlibs(dxgthk win32k) add_importlib_target(dxgthk.spec) -add_cab_target(dxgthk 2) +add_cd_file(TARGET dxgthk DESTINATION reactos/system32/drivers) diff --git a/drivers/filesystems/cdfs/CMakeLists.txt b/drivers/filesystems/cdfs/CMakeLists.txt index 3578bfa8716..611b731ee3a 100644 --- a/drivers/filesystems/cdfs/CMakeLists.txt +++ b/drivers/filesystems/cdfs/CMakeLists.txt @@ -24,5 +24,4 @@ add_importlibs(cdfs ntoskrnl hal) add_pch(cdfs ${CMAKE_CURRENT_SOURCE_DIR}/cdfs.h ${SOURCE}) -add_minicd_target(cdfs reactos cdfs.sys) -add_livecd_target(cdfs reactos/system32/drivers cdfs.sys) +add_cd_file(TARGET cdfs DESTINATION reactos/system32/drivers NO_CAB) diff --git a/drivers/filesystems/ext2/CMakeLists.txt b/drivers/filesystems/ext2/CMakeLists.txt index 3ae0112c845..d641d072cf6 100644 --- a/drivers/filesystems/ext2/CMakeLists.txt +++ b/drivers/filesystems/ext2/CMakeLists.txt @@ -28,5 +28,4 @@ target_link_libraries(ext2fs ${PSEH_LIB}) set_module_type(ext2fs kernelmodedriver) add_importlibs(ext2fs ntoskrnl hal) -add_minicd_target(ext2fs reactos ext2.sys) -add_livecd_target(ext2fs reactos/system32/drivers ext2.sys) +add_cd_file(TARGET ext2fs DESTINATION reactos/system32/drivers NO_CAB) diff --git a/drivers/filesystems/fastfat/CMakeLists.txt b/drivers/filesystems/fastfat/CMakeLists.txt index 85097eeddd1..5f446901a45 100644 --- a/drivers/filesystems/fastfat/CMakeLists.txt +++ b/drivers/filesystems/fastfat/CMakeLists.txt @@ -30,5 +30,4 @@ add_importlibs(fastfat ntoskrnl hal) add_pch(fastfat ${CMAKE_CURRENT_SOURCE_DIR}/vfat.h ${SOURCE}) -add_minicd_target(fastfat reactos fastfat.sys) -add_livecd_target(fastfat reactos/system32/drivers) +add_cd_file(TARGET fastfat DESTINATION reactos/system32/drivers NO_CAB) diff --git a/drivers/filesystems/fs_rec/CMakeLists.txt b/drivers/filesystems/fs_rec/CMakeLists.txt index c9b55ccb053..ef9375bdaa3 100644 --- a/drivers/filesystems/fs_rec/CMakeLists.txt +++ b/drivers/filesystems/fs_rec/CMakeLists.txt @@ -12,4 +12,4 @@ add_library(fs_rec SHARED set_module_type(fs_rec kernelmodedriver) add_importlibs(fs_rec ntoskrnl hal) -add_cab_target(fs_rec 2) +add_cd_file(TARGET fs_rec DESTINATION reactos/system32/drivers) diff --git a/drivers/filesystems/msfs/CMakeLists.txt b/drivers/filesystems/msfs/CMakeLists.txt index 40ca59ffd3f..fab238b93ef 100644 --- a/drivers/filesystems/msfs/CMakeLists.txt +++ b/drivers/filesystems/msfs/CMakeLists.txt @@ -14,4 +14,4 @@ add_importlibs(msfs ntoskrnl hal) add_pch(msfs ${CMAKE_CURRENT_SOURCE_DIR}/msfs.h ${SOURCE}) -add_cab_target(msfs 2) +add_cd_file(TARGET msfs DESTINATION reactos/system32/drivers) diff --git a/drivers/filesystems/mup/CMakeLists.txt b/drivers/filesystems/mup/CMakeLists.txt index 337ee4991a7..0d7b1fcfa68 100644 --- a/drivers/filesystems/mup/CMakeLists.txt +++ b/drivers/filesystems/mup/CMakeLists.txt @@ -7,4 +7,4 @@ add_library(mup SHARED set_module_type(mup kernelmodedriver) add_importlibs(mup ntoskrnl hal) -add_cab_target(mup 2) \ No newline at end of file +add_cd_file(TARGET mup DESTINATION reactos/system32/drivers) \ No newline at end of file diff --git a/drivers/filesystems/npfs/CMakeLists.txt b/drivers/filesystems/npfs/CMakeLists.txt index a0b764bee7a..40c0fcc947d 100644 --- a/drivers/filesystems/npfs/CMakeLists.txt +++ b/drivers/filesystems/npfs/CMakeLists.txt @@ -16,4 +16,4 @@ target_link_libraries(npfs ${PSEH_LIB}) set_module_type(npfs kernelmodedriver) add_importlibs(npfs ntoskrnl hal) add_pch(npfs ${CMAKE_CURRENT_SOURCE_DIR}/npfs.h ${SOURCE}) -add_cab_target(npfs 2) +add_cd_file(TARGET npfs DESTINATION reactos/system32/drivers) diff --git a/drivers/filesystems/ntfs/CMakeLists.txt b/drivers/filesystems/ntfs/CMakeLists.txt index f96e6d09076..54d8fc75eb6 100644 --- a/drivers/filesystems/ntfs/CMakeLists.txt +++ b/drivers/filesystems/ntfs/CMakeLists.txt @@ -24,5 +24,4 @@ add_importlibs(ntfs ntoskrnl hal) add_pch(ntfs ${CMAKE_CURRENT_SOURCE_DIR}/ntfs.h ${SOURCE}) -add_minicd_target(ntfs reactos) -add_livecd_target(ntfs reactos/system32/drivers) +add_cd_file(TARGET ntfs DESTINATION reactos/system32/drivers NO_CAB) diff --git a/drivers/input/i8042prt/CMakeLists.txt b/drivers/input/i8042prt/CMakeLists.txt index 2517d614dcd..4b8ebad447f 100644 --- a/drivers/input/i8042prt/CMakeLists.txt +++ b/drivers/input/i8042prt/CMakeLists.txt @@ -17,5 +17,4 @@ add_library(i8042prt SHARED set_module_type(i8042prt kernelmodedriver) add_importlibs(i8042prt ntoskrnl hal) -add_minicd_target(i8042prt reactos) -add_livecd_target(i8042prt reactos/system32/drivers) \ No newline at end of file +add_cd_file(TARGET i8042prt DESTINATION reactos/system32/drivers NO_CAB) \ No newline at end of file diff --git a/drivers/input/kbdclass/CMakeLists.txt b/drivers/input/kbdclass/CMakeLists.txt index 04f839a4c45..9a8e5810176 100644 --- a/drivers/input/kbdclass/CMakeLists.txt +++ b/drivers/input/kbdclass/CMakeLists.txt @@ -11,5 +11,4 @@ target_link_libraries(kbdclass ${PSEH_LIB}) add_importlibs(kbdclass ntoskrnl hal) -add_minicd_target(kbdclass reactos kbdclass.sys) -add_livecd_target(kbdclass reactos/system32/drivers) \ No newline at end of file +add_cd_file(TARGET kbdclass DESTINATION reactos/system32/drivers NO_CAB) \ No newline at end of file diff --git a/drivers/input/mouclass/CMakeLists.txt b/drivers/input/mouclass/CMakeLists.txt index 35e4ff68c76..e9b3a25b892 100644 --- a/drivers/input/mouclass/CMakeLists.txt +++ b/drivers/input/mouclass/CMakeLists.txt @@ -10,4 +10,4 @@ target_link_libraries(mouclass ${PSEH_LIB}) add_importlibs(mouclass ntoskrnl hal) -add_cab_target(mouclass 2) \ No newline at end of file +add_cd_file(TARGET mouclass DESTINATION reactos/system32/drivers) \ No newline at end of file diff --git a/drivers/input/sermouse/CMakeLists.txt b/drivers/input/sermouse/CMakeLists.txt index e9a2003a423..4969fbdad3c 100644 --- a/drivers/input/sermouse/CMakeLists.txt +++ b/drivers/input/sermouse/CMakeLists.txt @@ -12,4 +12,4 @@ add_library(sermouse SHARED set_module_type(sermouse kernelmodedriver) add_importlibs(sermouse ntoskrnl hal) -add_cab_target(sermouse 2) +add_cd_file(TARGET sermouse DESTINATION reactos/system32/drivers) diff --git a/drivers/ksfilter/ks/CMakeLists.txt b/drivers/ksfilter/ks/CMakeLists.txt index a4888e7cf76..e82dd2332fb 100644 --- a/drivers/ksfilter/ks/CMakeLists.txt +++ b/drivers/ksfilter/ks/CMakeLists.txt @@ -44,5 +44,5 @@ target_link_libraries(ks ${PSEH_LIB}) add_importlibs(ks ntoskrnl hal) add_dependencies(ks psdk bugcodes) -add_cab_target(ks 2) +add_cd_file(TARGET ks DESTINATION reactos/system32/drivers) add_importlib_target(ks.spec) diff --git a/drivers/ksfilter/swenum/CMakeLists.txt b/drivers/ksfilter/swenum/CMakeLists.txt index fbf53f76f61..f99d7b5242d 100644 --- a/drivers/ksfilter/swenum/CMakeLists.txt +++ b/drivers/ksfilter/swenum/CMakeLists.txt @@ -7,5 +7,4 @@ add_library(swenum SHARED ${SOURCE}) set_module_type(swenum kernelmodedriver) add_importlibs(swenum ks ntoskrnl hal) -add_minicd_target(swenum reactos) -add_livecd_target(swenum reactos/system32/drivers) +add_cd_file(TARGET swenum DESTINATION reactos/system32/drivers NO_CAB) diff --git a/drivers/network/afd/CMakeLists.txt b/drivers/network/afd/CMakeLists.txt index e01c8034d3f..b42d53eb6ff 100644 --- a/drivers/network/afd/CMakeLists.txt +++ b/drivers/network/afd/CMakeLists.txt @@ -26,4 +26,4 @@ add_importlibs(afd ntoskrnl hal) add_pch(afd ${CMAKE_CURRENT_SOURCE_DIR}/include/afd.h ${SOURCE}) -add_cab_target(afd 2) +add_cd_file(TARGET afd DESTINATION reactos/system32/drivers) diff --git a/drivers/network/dd/ne2000/CMakeLists.txt b/drivers/network/dd/ne2000/CMakeLists.txt index dcdbd12a4fb..0d370252b42 100644 --- a/drivers/network/dd/ne2000/CMakeLists.txt +++ b/drivers/network/dd/ne2000/CMakeLists.txt @@ -11,4 +11,4 @@ add_library(ne2000 SHARED ${SOURCE}) set_module_type(ne2000 kernelmodedriver) add_importlibs(ne2000 ndis ntoskrnl hal) -add_cab_target(ne2000 2) +add_cd_file(TARGET ne2000 DESTINATION reactos/system32/drivers) diff --git a/drivers/network/dd/pcnet/CMakeLists.txt b/drivers/network/dd/pcnet/CMakeLists.txt index b42819e08a9..cf17dfee5d1 100644 --- a/drivers/network/dd/pcnet/CMakeLists.txt +++ b/drivers/network/dd/pcnet/CMakeLists.txt @@ -15,4 +15,4 @@ add_library(pcnet SHARED ${SOURCE}) set_module_type(pcnet kernelmodedriver) add_importlibs(pcnet ndis ntoskrnl hal) -add_cab_target(pcnet 2) +add_cd_file(TARGET pcnet DESTINATION reactos/system32/drivers) diff --git a/drivers/network/ndis/CMakeLists.txt b/drivers/network/ndis/CMakeLists.txt index 16263ac4112..27886dad1cb 100644 --- a/drivers/network/ndis/CMakeLists.txt +++ b/drivers/network/ndis/CMakeLists.txt @@ -42,5 +42,5 @@ add_importlibs(ndis ntoskrnl hal) add_pch(ndis ${CMAKE_CURRENT_SOURCE_DIR}/include/ndissys.h ${SOURCE}) -add_cab_target(ndis 2) +add_cd_file(TARGET ndis DESTINATION reactos/system32/drivers) add_importlib_target(ndis.spec) diff --git a/drivers/network/tcpip/CMakeLists.txt b/drivers/network/tcpip/CMakeLists.txt index 65e1a278b9a..5eba8c62547 100644 --- a/drivers/network/tcpip/CMakeLists.txt +++ b/drivers/network/tcpip/CMakeLists.txt @@ -39,4 +39,4 @@ add_importlibs(tcpip ndis ntoskrnl hal) add_pch(tcpip ${CMAKE_CURRENT_SOURCE_DIR}/include/precomp.h ${SOURCE}) -add_cab_target(tcpip 2) +add_cd_file(TARGET tcpip DESTINATION reactos/system32/drivers) diff --git a/drivers/network/tdi/CMakeLists.txt b/drivers/network/tdi/CMakeLists.txt index 1b57c6f1c4b..6ea1f5ac1e5 100644 --- a/drivers/network/tdi/CMakeLists.txt +++ b/drivers/network/tdi/CMakeLists.txt @@ -27,4 +27,4 @@ add_library(tdi SHARED ${SOURCE}) set_module_type(tdi kernelmodedriver) add_importlibs(tdi ntoskrnl hal) -add_cab_target(tdi 2) +add_cd_file(TARGET tdi DESTINATION reactos/system32/drivers) diff --git a/drivers/serial/serenum/CMakeLists.txt b/drivers/serial/serenum/CMakeLists.txt index 8066291325f..ad4cfe4b110 100644 --- a/drivers/serial/serenum/CMakeLists.txt +++ b/drivers/serial/serenum/CMakeLists.txt @@ -10,4 +10,4 @@ add_library(serenum SHARED set_module_type(serenum kernelmodedriver) add_importlibs(serenum ntoskrnl hal) -add_cab_target(serenum 2) +add_cd_file(TARGET serenum DESTINATION reactos/system32/drivers) diff --git a/drivers/serial/serial/CMakeLists.txt b/drivers/serial/serial/CMakeLists.txt index 1065fc5d7e8..b879d900d3e 100644 --- a/drivers/serial/serial/CMakeLists.txt +++ b/drivers/serial/serial/CMakeLists.txt @@ -17,4 +17,4 @@ add_library(serial SHARED set_module_type(serial kernelmodedriver) add_importlibs(serial ntoskrnl hal) -add_cab_target(serial 2) +add_cd_file(TARGET serial DESTINATION reactos/system32/drivers) diff --git a/drivers/setup/blue/CMakeLists.txt b/drivers/setup/blue/CMakeLists.txt index 2924d43c9d9..2bc4ddf4ac9 100644 --- a/drivers/setup/blue/CMakeLists.txt +++ b/drivers/setup/blue/CMakeLists.txt @@ -6,5 +6,4 @@ add_library(blue SHARED blue.c font.c blue.rc) set_module_type(blue kernelmodedriver) add_importlibs(blue ntoskrnl hal) -add_minicd_target(blue reactos blue.sys) -add_livecd_target(blue reactos/system32/drivers) +add_cd_file(TARGET blue DESTINATION reactos/system32/drivers NO_CAB) diff --git a/drivers/storage/class/cdrom/CMakeLists.txt b/drivers/storage/class/cdrom/CMakeLists.txt index 884fcfbc204..a13bdb59081 100644 --- a/drivers/storage/class/cdrom/CMakeLists.txt +++ b/drivers/storage/class/cdrom/CMakeLists.txt @@ -10,5 +10,4 @@ add_importlibs(cdrom ntoskrnl hal) -add_minicd_target(cdrom reactos cdrom.sys) -add_livecd_target(cdrom reactos/system32/drivers) +add_cd_file(TARGET cdrom DESTINATION reactos/system32/drivers NO_CAB) diff --git a/drivers/storage/class/class2/CMakeLists.txt b/drivers/storage/class/class2/CMakeLists.txt index 48ba7289551..8fe81f0fdef 100644 --- a/drivers/storage/class/class2/CMakeLists.txt +++ b/drivers/storage/class/class2/CMakeLists.txt @@ -15,5 +15,4 @@ set_module_type(class2 kernelmodedriver) add_importlibs(class2 scsiport ntoskrnl hal) add_importlib_target(class2.spec) -add_minicd_target(class2 reactos class2.sys) -add_livecd_target(class2 reactos/system32/drivers) +add_cd_file(TARGET class2 DESTINATION reactos/system32/drivers NO_CAB) diff --git a/drivers/storage/class/disk/CMakeLists.txt b/drivers/storage/class/disk/CMakeLists.txt index e3f89abc46f..59fa34558d0 100644 --- a/drivers/storage/class/disk/CMakeLists.txt +++ b/drivers/storage/class/disk/CMakeLists.txt @@ -10,5 +10,4 @@ add_importlibs(disk ntoskrnl hal) -add_minicd_target(disk reactos disk.sys) -add_livecd_target(disk reactos/system32/drivers) +add_cd_file(TARGET disk DESTINATION reactos/system32/drivers NO_CAB) diff --git a/drivers/storage/class/ramdisk/CMakeLists.txt b/drivers/storage/class/ramdisk/CMakeLists.txt index 6f6f1342aa8..28ec36dc30d 100644 --- a/drivers/storage/class/ramdisk/CMakeLists.txt +++ b/drivers/storage/class/ramdisk/CMakeLists.txt @@ -8,5 +8,4 @@ add_importlibs(ramdisk ntoskrnl hal) -add_minicd_target(ramdisk reactos ramdisk.sys) -add_livecd_target(ramdisk reactos/system32/drivers) +add_cd_file(TARGET ramdisk DESTINATION reactos/system32/drivers NO_CAB) diff --git a/drivers/storage/classpnp/CMakeLists.txt b/drivers/storage/classpnp/CMakeLists.txt index 0dfb6a4e15f..aa6f958d76c 100644 --- a/drivers/storage/classpnp/CMakeLists.txt +++ b/drivers/storage/classpnp/CMakeLists.txt @@ -43,5 +43,4 @@ target_link_libraries(classpnp ${PSEH_LIB} libcntpr) set_module_type(classpnp kernelmodedriver) add_importlibs(classpnp hal ntoskrnl) -add_minicd_target(classpnp reactos classpnp.sys) -add_livecd_target(classpnp reactos/system32/drivers) +add_cd_file(TARGET classpnp DESTINATION reactos/system32/drivers NO_CAB) diff --git a/drivers/storage/floppy/CMakeLists.txt b/drivers/storage/floppy/CMakeLists.txt index d1dcd34951c..01d54a00582 100644 --- a/drivers/storage/floppy/CMakeLists.txt +++ b/drivers/storage/floppy/CMakeLists.txt @@ -12,5 +12,4 @@ target_link_libraries(floppy csq) set_module_type(floppy kernelmodedriver) add_importlibs(floppy hal ntoskrnl) -add_minicd_target(floppy reactos floppy.sys) -add_livecd_target(floppy reactos/system32/drivers) +add_cd_file(TARGET floppy DESTINATION reactos/system32/drivers NO_CAB) diff --git a/drivers/storage/ide/atapi/CMakeLists.txt b/drivers/storage/ide/atapi/CMakeLists.txt index 61b478aaade..dd4ce4f647e 100644 --- a/drivers/storage/ide/atapi/CMakeLists.txt +++ b/drivers/storage/ide/atapi/CMakeLists.txt @@ -6,5 +6,4 @@ target_link_libraries(atapi libcntpr) set_module_type(atapi kernelmodedriver) add_importlibs(atapi scsiport) -add_minicd_target(atapi reactos atapi.sys) -add_livecd_target(atapi reactos/system32/drivers) +add_cd_file(TARGET atapi DESTINATION reactos/system32/drivers NO_CAB) diff --git a/drivers/storage/ide/pciide/CMakeLists.txt b/drivers/storage/ide/pciide/CMakeLists.txt index add5953708a..01d34a89791 100644 --- a/drivers/storage/ide/pciide/CMakeLists.txt +++ b/drivers/storage/ide/pciide/CMakeLists.txt @@ -4,4 +4,4 @@ add_library(pciide SHARED pciide.c pciide.rc) set_module_type(pciide kernelmodedriver) add_importlibs(pciide pciidex ntoskrnl) -add_cab_target(pciide 2) +add_cd_file(TARGET pciide DESTINATION reactos/system32/drivers) diff --git a/drivers/storage/ide/pciidex/CMakeLists.txt b/drivers/storage/ide/pciidex/CMakeLists.txt index 1d70540319f..63ee7a79707 100644 --- a/drivers/storage/ide/pciidex/CMakeLists.txt +++ b/drivers/storage/ide/pciidex/CMakeLists.txt @@ -15,5 +15,5 @@ add_library(pciidex SHARED ${SOURCE}) set_module_type(pciidex kernelmodedriver) add_importlibs(pciidex ntoskrnl) -add_cab_target(pciidex 2) +add_cd_file(TARGET pciidex DESTINATION reactos/system32/drivers) add_importlib_target(pciidex.spec) diff --git a/drivers/storage/ide/uniata/CMakeLists.txt b/drivers/storage/ide/uniata/CMakeLists.txt index aaaeaac4d74..66940438e3f 100644 --- a/drivers/storage/ide/uniata/CMakeLists.txt +++ b/drivers/storage/ide/uniata/CMakeLists.txt @@ -18,5 +18,4 @@ add_library(uniata SHARED set_module_type(uniata kernelmodedriver) add_importlibs(uniata scsiport ntoskrnl hal) -add_minicd_target(uniata reactos uniata.sys) -add_livecd_target(uniata reactos/system32/drivers) \ No newline at end of file +add_cd_file(TARGET uniata DESTINATION reactos/system32/drivers NO_CAB) \ No newline at end of file diff --git a/drivers/storage/port/buslogic/CMakeLists.txt b/drivers/storage/port/buslogic/CMakeLists.txt index 73bd52e189a..b7749e6cd23 100644 --- a/drivers/storage/port/buslogic/CMakeLists.txt +++ b/drivers/storage/port/buslogic/CMakeLists.txt @@ -8,5 +8,4 @@ target_link_libraries(buslogic libcntpr) set_module_type(buslogic kernelmodedriver) add_importlibs(buslogic scsiport) -add_minicd_target(buslogic reactos buslogic.sys) -add_livecd_target(buslogic reactos/system32/drivers) +add_cd_file(TARGET buslogic DESTINATION reactos/system32/drivers NO_CAB) diff --git a/drivers/storage/scsiport/CMakeLists.txt b/drivers/storage/scsiport/CMakeLists.txt index 861490c2c2a..71cb87d63a9 100644 --- a/drivers/storage/scsiport/CMakeLists.txt +++ b/drivers/storage/scsiport/CMakeLists.txt @@ -14,5 +14,4 @@ set_module_type(scsiport kernelmodedriver) add_importlibs(scsiport ntoskrnl hal) add_importlib_target(scsiport.spec) -add_minicd_target(scsiport reactos scsiport.sys) -add_livecd_target(scsiport reactos/system32/drivers) +add_cd_file(TARGET scsiport DESTINATION reactos/system32/drivers NO_CAB) diff --git a/drivers/usb/nt4compat/usbdriver/CMakeLists.txt b/drivers/usb/nt4compat/usbdriver/CMakeLists.txt index aa8511b9cb4..dc0c4c509b0 100644 --- a/drivers/usb/nt4compat/usbdriver/CMakeLists.txt +++ b/drivers/usb/nt4compat/usbdriver/CMakeLists.txt @@ -32,4 +32,4 @@ add_importlibs(usbdriver ntoskrnl hal) add_pch(usbdriver ${CMAKE_CURRENT_SOURCE_DIR}/usbdriver.h ${SOURCE}) -add_cab_target(usbdriver 2) +add_cd_file(TARGET usbdriver DESTINATION reactos/system32/drivers) diff --git a/drivers/video/displays/framebuf/CMakeLists.txt b/drivers/video/displays/framebuf/CMakeLists.txt index b002cca9af5..058153cbb24 100644 --- a/drivers/video/displays/framebuf/CMakeLists.txt +++ b/drivers/video/displays/framebuf/CMakeLists.txt @@ -16,4 +16,4 @@ set_image_base(framebuf 0x00010000) target_link_libraries(framebuf libcntpr) add_importlibs(framebuf win32k) add_dependencies(framebuf psdk bugcodes) -add_cab_target(framebuf 1) +add_cd_file(TARGET framebuf DESTINATION reactos/system32) diff --git a/drivers/video/displays/vga/CMakeLists.txt b/drivers/video/displays/vga/CMakeLists.txt index 811c0d5a171..dc5d2d5a781 100644 --- a/drivers/video/displays/vga/CMakeLists.txt +++ b/drivers/video/displays/vga/CMakeLists.txt @@ -22,4 +22,4 @@ set_image_base(vgaddi 0x00010000) add_importlibs(vgaddi win32k) target_link_libraries(vgaddi libcntpr) add_dependencies(vgaddi psdk bugcodes) -add_cab_target(vgaddi 1) \ No newline at end of file +add_cd_file(TARGET vgaddi DESTINATION reactos/system32) \ No newline at end of file diff --git a/drivers/video/font/ftfd/CMakeLists.txt b/drivers/video/font/ftfd/CMakeLists.txt index cf7d5402d35..48a7dc75132 100644 --- a/drivers/video/font/ftfd/CMakeLists.txt +++ b/drivers/video/font/ftfd/CMakeLists.txt @@ -21,5 +21,5 @@ target_link_libraries(ftfd add_importlibs(ftfd win32k) add_dependencies(ftfd psdk) -add_cab_target(ftfd 1) +add_cd_file(TARGET ftfd DESTINATION reactos/system32) add_importlib_target(ftfd.spec) diff --git a/drivers/video/miniport/vbe/CMakeLists.txt b/drivers/video/miniport/vbe/CMakeLists.txt index f6717eac842..9ff4a1abba2 100644 --- a/drivers/video/miniport/vbe/CMakeLists.txt +++ b/drivers/video/miniport/vbe/CMakeLists.txt @@ -9,4 +9,4 @@ add_importlibs(vbemp videoprt) target_link_libraries(vbemp libcntpr) -add_cab_target(vbemp 2) +add_cd_file(TARGET vbemp DESTINATION reactos/system32/drivers) diff --git a/drivers/video/miniport/vga/CMakeLists.txt b/drivers/video/miniport/vga/CMakeLists.txt index b002947d8a0..94037e7a338 100644 --- a/drivers/video/miniport/vga/CMakeLists.txt +++ b/drivers/video/miniport/vga/CMakeLists.txt @@ -10,4 +10,4 @@ set_module_type(vgamp kernelmodedriver) add_importlibs(vgamp videoprt) add_pch(vgamp ${CMAKE_CURRENT_SOURCE_DIR}/vgamp.h ${SOURCE}) -add_cab_target(vgamp 2) +add_cd_file(TARGET vgamp DESTINATION reactos/system32/drivers) diff --git a/drivers/video/miniport/vga_new/CMakeLists.txt b/drivers/video/miniport/vga_new/CMakeLists.txt index af382e9dfa6..46bc7d89097 100644 --- a/drivers/video/miniport/vga_new/CMakeLists.txt +++ b/drivers/video/miniport/vga_new/CMakeLists.txt @@ -22,4 +22,4 @@ add_importlibs(vga videoprt) add_pch(vga ${CMAKE_CURRENT_SOURCE_DIR}/vga.h ${SOURCE}) -add_cab_target(vga 2) +add_cd_file(TARGET vga DESTINATION reactos/system32/drivers) diff --git a/drivers/video/videoprt/CMakeLists.txt b/drivers/video/videoprt/CMakeLists.txt index 492ca51edea..ef1e28bd9d6 100644 --- a/drivers/video/videoprt/CMakeLists.txt +++ b/drivers/video/videoprt/CMakeLists.txt @@ -29,5 +29,5 @@ set_module_type(videoprt kernelmodedriver) add_importlibs(videoprt ntoskrnl hal) add_pch(videoprt ${CMAKE_CURRENT_SOURCE_DIR}/videoprt.h ${SOURCE}) -add_cab_target(videoprt 2) +add_cd_file(TARGET videoprt DESTINATION reactos/system32/drivers) add_importlib_target(videoprt.spec) diff --git a/drivers/wdm/audio/backpln/portcls/CMakeLists.txt b/drivers/wdm/audio/backpln/portcls/CMakeLists.txt index 07d3645b348..34c83f6de6c 100644 --- a/drivers/wdm/audio/backpln/portcls/CMakeLists.txt +++ b/drivers/wdm/audio/backpln/portcls/CMakeLists.txt @@ -70,4 +70,4 @@ set_target_properties(portcls PROPERTIES SUFFIX ".sys") add_importlibs(portcls ntoskrnl ks drmk hal) -add_cab_target(portcls 2) \ No newline at end of file +add_cd_file(TARGET portcls DESTINATION reactos/system32/drivers) \ No newline at end of file diff --git a/drivers/wdm/audio/drm/drmk/CMakeLists.txt b/drivers/wdm/audio/drm/drmk/CMakeLists.txt index a0afcdbd1ef..548476b22f2 100644 --- a/drivers/wdm/audio/drm/drmk/CMakeLists.txt +++ b/drivers/wdm/audio/drm/drmk/CMakeLists.txt @@ -26,4 +26,4 @@ set_entrypoint(drmk 0) add_importlibs(drmk ntoskrnl) add_importlib_target(drmk.spec) -add_cab_target(drmk 2) +add_cd_file(TARGET drmk DESTINATION reactos/system32/drivers) diff --git a/drivers/wdm/audio/filters/kmixer/CMakeLists.txt b/drivers/wdm/audio/filters/kmixer/CMakeLists.txt index 49b90ae7130..beebdfb7f60 100644 --- a/drivers/wdm/audio/filters/kmixer/CMakeLists.txt +++ b/drivers/wdm/audio/filters/kmixer/CMakeLists.txt @@ -14,4 +14,4 @@ target_link_libraries(kmixer add_importlibs(kmixer ntoskrnl ks hal) -add_cab_target(kmixer 2) \ No newline at end of file +add_cd_file(TARGET kmixer DESTINATION reactos/system32/drivers) \ No newline at end of file diff --git a/drivers/wdm/audio/legacy/wdmaud/CMakeLists.txt b/drivers/wdm/audio/legacy/wdmaud/CMakeLists.txt index 2c3107cd206..aad67642442 100644 --- a/drivers/wdm/audio/legacy/wdmaud/CMakeLists.txt +++ b/drivers/wdm/audio/legacy/wdmaud/CMakeLists.txt @@ -23,4 +23,4 @@ target_link_libraries(wdmaud add_importlibs(wdmaud ntoskrnl ks hal) -add_cab_target(wdmaud 2) \ No newline at end of file +add_cd_file(TARGET wdmaud DESTINATION reactos/system32/drivers) \ No newline at end of file diff --git a/drivers/wdm/audio/sysaudio/CMakeLists.txt b/drivers/wdm/audio/sysaudio/CMakeLists.txt index b8ee459371a..d51f7d51743 100644 --- a/drivers/wdm/audio/sysaudio/CMakeLists.txt +++ b/drivers/wdm/audio/sysaudio/CMakeLists.txt @@ -15,4 +15,4 @@ target_link_libraries(sysaudio libcntpr) add_importlibs(sysaudio ntoskrnl ks hal) -add_cab_target(sysaudio 2) \ No newline at end of file +add_cd_file(TARGET sysaudio DESTINATION reactos/system32/drivers) \ No newline at end of file diff --git a/drivers/wmi/CMakeLists.txt b/drivers/wmi/CMakeLists.txt index 7167673a862..531568ff55e 100644 --- a/drivers/wmi/CMakeLists.txt +++ b/drivers/wmi/CMakeLists.txt @@ -25,4 +25,4 @@ set_target_properties(wmilib PROPERTIES SUFFIX ".sys") add_importlibs(wmilib ntoskrnl) add_importlib_target(wmilib.spec) -add_cab_target(wmilib 2) +add_cd_file(TARGET wmilib DESTINATION reactos/system32/drivers) diff --git a/hal/halx86/CMakeLists.txt b/hal/halx86/CMakeLists.txt index 9d2362aef02..c4467cf138b 100644 --- a/hal/halx86/CMakeLists.txt +++ b/hal/halx86/CMakeLists.txt @@ -101,8 +101,7 @@ if(ARCH MATCHES i386) add_importlibs(hal ntoskrnl) target_link_libraries(hal libcntpr) - add_minicd_target(hal reactos hal.dll) - add_livecd_target(hal reactos/system32) + add_cd_file(TARGET hal DESTINATION reactos/system32 NO_CAB) # mini_hal add_library(mini_hal ${MINI_HAL_SOURCE}) diff --git a/media/CMakeLists.txt b/media/CMakeLists.txt index c86b866b70f..74fb81be34f 100644 --- a/media/CMakeLists.txt +++ b/media/CMakeLists.txt @@ -3,11 +3,7 @@ add_subdirectory(inf) add_subdirectory(nls) add_subdirectory(vgafonts) -add_minicd(${CMAKE_CURRENT_SOURCE_DIR}/drivers/etc/hosts reactos hosts) -add_minicd(${CMAKE_CURRENT_SOURCE_DIR}/drivers/etc/KDBinit reactos KDBinit) -add_minicd(${CMAKE_CURRENT_SOURCE_DIR}/drivers/etc/services reactos services) - -add_cab(${CMAKE_CURRENT_SOURCE_DIR}/drivers/etc/hosts 5) -add_cab(${CMAKE_CURRENT_SOURCE_DIR}/drivers/etc/KDBinit 5) -add_cab(${CMAKE_CURRENT_SOURCE_DIR}/drivers/etc/services 5) -add_cab(${CMAKE_CURRENT_SOURCE_DIR}/sounds/ReactOS_LogOn.wav 8) \ No newline at end of file +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/drivers/etc/hosts DESTINATION reactos/system32/drivers/etc) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/drivers/etc/KDBinit DESTINATION reactos/system32/drivers/etc) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/drivers/etc/services DESTINATION reactos/system32/drivers/etc) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/sounds/ReactOS_LogOn.wav DESTINATION reactos/media) \ No newline at end of file diff --git a/media/fonts/CMakeLists.txt b/media/fonts/CMakeLists.txt index b2e6f472204..054f15d066f 100644 --- a/media/fonts/CMakeLists.txt +++ b/media/fonts/CMakeLists.txt @@ -34,5 +34,5 @@ list(APPEND FONT_FILES ) foreach(item ${FONT_FILES}) - add_cab("${CMAKE_CURRENT_SOURCE_DIR}/${item}" 3) + add_cd_file(FILE "${CMAKE_CURRENT_SOURCE_DIR}/${item}" DESTINATION reactos/Fonts) endforeach(item) \ No newline at end of file diff --git a/media/inf/CMakeLists.txt b/media/inf/CMakeLists.txt index 8237cc71930..a1b7f17f760 100644 --- a/media/inf/CMakeLists.txt +++ b/media/inf/CMakeLists.txt @@ -30,7 +30,7 @@ list(APPEND INF_FILES ) foreach(item ${INF_FILES}) - add_cab("${CMAKE_CURRENT_SOURCE_DIR}/${item}" 6) + add_cd_file(FILE "${CMAKE_CURRENT_SOURCE_DIR}/${item}" DESTINATION reactos/inf) endforeach(item) -add_cab(${CMAKE_CURRENT_SOURCE_DIR}/syssetup.inf 6) \ No newline at end of file +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/syssetup.inf DESTINATION reactos/inf) \ No newline at end of file diff --git a/media/nls/CMakeLists.txt b/media/nls/CMakeLists.txt index 3fd3a16545a..c8e8a1164d0 100644 --- a/media/nls/CMakeLists.txt +++ b/media/nls/CMakeLists.txt @@ -1,9 +1,6 @@ -add_minicd(${CMAKE_CURRENT_SOURCE_DIR}/l_intl.nls reactos l_intl.nls) -add_minicd(${CMAKE_CURRENT_SOURCE_DIR}/c_437.nls reactos c_437.nls) -add_minicd(${CMAKE_CURRENT_SOURCE_DIR}/c_1252.nls reactos c_1252.nls) -add_livecd(${CMAKE_CURRENT_SOURCE_DIR}/l_intl.nls reactos/system32) -add_livecd(${CMAKE_CURRENT_SOURCE_DIR}/c_437.nls reactos/system32 c_437.nls) -add_livecd(${CMAKE_CURRENT_SOURCE_DIR}/c_1252.nls reactos/system32 c_1252.nls) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/l_intl.nls DESTINATION reactos/system32 NO_CAB) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/c_437.nls DESTINATION reactos/system32 NO_CAB) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/c_1252.nls DESTINATION reactos/system32 NO_CAB) list(APPEND NLS_FILES c_037.nls @@ -67,5 +64,5 @@ list(APPEND NLS_FILES foreach(item ${NLS_FILES}) - add_cab("${CMAKE_CURRENT_SOURCE_DIR}/${item}" 1 ${item}) + add_cd_file(FILE "${CMAKE_CURRENT_SOURCE_DIR}/${item}" DESTINATION reactos/system32) endforeach(item) diff --git a/media/vgafonts/CMakeLists.txt b/media/vgafonts/CMakeLists.txt index 069c830e347..ac828509ecc 100644 --- a/media/vgafonts/CMakeLists.txt +++ b/media/vgafonts/CMakeLists.txt @@ -16,5 +16,5 @@ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/vgafonts.cab add_custom_target(vgafonts DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/vgafonts.cab) -add_minicd(${CMAKE_CURRENT_BINARY_DIR}/vgafonts.cab reactos vgafonts.cab) -add_cab(${CMAKE_CURRENT_BINARY_DIR}/vgafonts.cab 4) \ No newline at end of file +#add_cd_file(TARGET vgafonts FILE ${CMAKE_CURRENT_BINARY_DIR}/vgafonts.cab DESTINATION reactos NO_LIVECD) +add_cd_file(TARGET vgafonts FILE ${CMAKE_CURRENT_BINARY_DIR}/vgafonts.cab DESTINATION reactos NO_CAB) \ No newline at end of file diff --git a/ntoskrnl/CMakeLists.txt b/ntoskrnl/CMakeLists.txt index 6053b38cb76..43046bbda7e 100644 --- a/ntoskrnl/CMakeLists.txt +++ b/ntoskrnl/CMakeLists.txt @@ -448,8 +448,7 @@ add_importlibs(ntoskrnl hal kdcom bootvid) add_pch(ntoskrnl ${CMAKE_CURRENT_SOURCE_DIR}/include/ntoskrnl.h ${SOURCE}) add_dependencies(ntoskrnl psdk bugcodes asm) -add_minicd_target(ntoskrnl reactos ntoskrnl.exe) -add_livecd_target(ntoskrnl reactos/system32) +add_cd_file(TARGET ntoskrnl DESTINATION reactos/system32 NO_CAB) add_importlib_target(ntoskrnl.spec) add_library(ntdllsys ntdll.S) diff --git a/ntoskrnl/ke/i386/cpu.c b/ntoskrnl/ke/i386/cpu.c index 7f3358cdee9..0fd2dcc459d 100644 --- a/ntoskrnl/ke/i386/cpu.c +++ b/ntoskrnl/ke/i386/cpu.c @@ -41,7 +41,7 @@ ULONG KeDcacheFlushCount = 0; ULONG KeIcacheFlushCount = 0; ULONG KiDmaIoCoherency = 0; ULONG KePrefetchNTAGranularity = 32; -CHAR KeNumberProcessors; +CHAR KeNumberProcessors = 0; KAFFINITY KeActiveProcessors = 1; BOOLEAN KiI386PentiumLockErrataPresent; BOOLEAN KiSMTProcessorsPresent; diff --git a/subsystems/ntvdm/CMakeLists.txt b/subsystems/ntvdm/CMakeLists.txt index 47d5755a7a0..d916c941e4c 100644 --- a/subsystems/ntvdm/CMakeLists.txt +++ b/subsystems/ntvdm/CMakeLists.txt @@ -16,4 +16,4 @@ target_link_libraries(ntvdm add_importlibs(ntvdm ntdll user32 gdi32 advapi32 kernel32 msvcrt) add_dependencies(ntvdm ndk bugcodes) -add_cab_target(ntvdm 1) \ No newline at end of file +add_cd_file(TARGET ntvdm DESTINATION reactos/system32) \ No newline at end of file diff --git a/subsystems/win32/csrss/CMakeLists.txt b/subsystems/win32/csrss/CMakeLists.txt index 640062b5421..24dc4a8c38f 100644 --- a/subsystems/win32/csrss/CMakeLists.txt +++ b/subsystems/win32/csrss/CMakeLists.txt @@ -10,7 +10,7 @@ set_module_type(csrss nativecui) target_link_libraries(csrss nt) add_importlibs(csrss ntdll csrsrv) add_dependencies(csrss psdk bugcodes) -add_cab_target(csrss 1) +add_cd_file(TARGET csrss DESTINATION reactos/system32) add_subdirectory(csrsrv) add_subdirectory(win32csr) diff --git a/subsystems/win32/csrss/csrsrv/CMakeLists.txt b/subsystems/win32/csrss/csrsrv/CMakeLists.txt index cf16e3e7c42..9fba237055b 100644 --- a/subsystems/win32/csrss/csrsrv/CMakeLists.txt +++ b/subsystems/win32/csrss/csrsrv/CMakeLists.txt @@ -29,5 +29,5 @@ add_importlibs(csrsrv ntdll smdll) add_pch(csrsrv ${CMAKE_CURRENT_SOURCE_DIR}/srv.h ${SOURCE}) add_dependencies(csrsrv psdk bugcodes) -add_cab_target(csrsrv 1) +add_cd_file(TARGET csrsrv DESTINATION reactos/system32) add_importlib_target(csrsrv.spec) diff --git a/subsystems/win32/csrss/win32csr/CMakeLists.txt b/subsystems/win32/csrss/win32csr/CMakeLists.txt index 1746859f780..58661d16a62 100644 --- a/subsystems/win32/csrss/win32csr/CMakeLists.txt +++ b/subsystems/win32/csrss/win32csr/CMakeLists.txt @@ -41,4 +41,4 @@ add_importlibs(win32csr user32 gdi32 advapi32 psapi msvcrt kernel32 ntdll) add_pch(win32csr ${CMAKE_CURRENT_SOURCE_DIR}/w32csr.h ${SOURCE}) add_dependencies(win32csr bugcodes) -add_cab_target(win32csr 1) +add_cd_file(TARGET win32csr DESTINATION reactos/system32) diff --git a/subsystems/win32/win32k/CMakeLists.txt b/subsystems/win32/win32k/CMakeLists.txt index 78df46e2f9a..f03b703b837 100644 --- a/subsystems/win32/win32k/CMakeLists.txt +++ b/subsystems/win32/win32k/CMakeLists.txt @@ -196,7 +196,7 @@ target_link_libraries(win32k add_importlibs(win32k ntoskrnl hal ftfd) add_pch(win32k ${CMAKE_CURRENT_SOURCE_DIR}/pch.h ${SOURCE}) add_dependencies(win32k gendib_generated) -add_cab_target(win32k 1) +add_cd_file(TARGET win32k DESTINATION reactos/system32) add_importlib_target(win32k.spec) add_library(win32ksys sys-stubs.S)