From: Thomas Faber Date: Mon, 7 Sep 2015 10:05:42 +0000 (+0000) Subject: [CMAKE] X-Git-Tag: ReactOS-0.4.0~961 X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=4f3a4a5c0406922185de818c4b168a3c57cf4a2a;hp=002f279f26988937083195e3ae384a5ff009d892 [CMAKE] - Fix more missing dependencies on xdk CORE-9586 svn path=/trunk/; revision=69086 --- diff --git a/reactos/boot/freeldr/freeldr/CMakeLists.txt b/reactos/boot/freeldr/freeldr/CMakeLists.txt index 70a058fd7d8..b147fa6a9b3 100644 --- a/reactos/boot/freeldr/freeldr/CMakeLists.txt +++ b/reactos/boot/freeldr/freeldr/CMakeLists.txt @@ -157,7 +157,7 @@ endif() add_asm_files(freeldr_common_asm ${FREELDR_COMMON_ASM_SOURCE}) add_library(freeldr_common ${FREELDR_COMMON_SOURCE} ${freeldr_common_asm}) add_pch(freeldr_common include/freeldr.h FREELDR_COMMON_SOURCE) -add_dependencies(freeldr_common bugcodes) +add_dependencies(freeldr_common bugcodes xdk) if(ARCH STREQUAL "i386" AND NOT MSVC) list(APPEND FREELDR_BASE_SOURCE arch/i386/multiboot.S) diff --git a/reactos/cmake/CMakeMacros.cmake b/reactos/cmake/CMakeMacros.cmake index 45a01fc3e42..68ab5a685ac 100644 --- a/reactos/cmake/CMakeMacros.cmake +++ b/reactos/cmake/CMakeMacros.cmake @@ -647,7 +647,7 @@ function(set_module_type MODULE TYPE) # Now do some stuff which is specific to each type if((${TYPE} STREQUAL kernelmodedriver) OR (${TYPE} STREQUAL wdmdriver) OR (${TYPE} STREQUAL kerneldll)) - add_dependencies(${MODULE} bugcodes) + add_dependencies(${MODULE} bugcodes xdk) if((${TYPE} STREQUAL kernelmodedriver) OR (${TYPE} STREQUAL wdmdriver)) set_target_properties(${MODULE} PROPERTIES SUFFIX ".sys") endif() diff --git a/reactos/drivers/bus/acpi/CMakeLists.txt b/reactos/drivers/bus/acpi/CMakeLists.txt index 0352cc0cf19..cac5c15ebc8 100644 --- a/reactos/drivers/bus/acpi/CMakeLists.txt +++ b/reactos/drivers/bus/acpi/CMakeLists.txt @@ -165,7 +165,7 @@ add_library(acpica add_pch(acpica acpica/include/acpi.h ACPICA_SOURCE) set_target_properties(acpica PROPERTIES COMPILE_DEFINITIONS "ACPI_USE_LOCAL_CACHE") -add_dependencies(acpica bugcodes) +add_dependencies(acpica bugcodes xdk) list(APPEND ACPI_SOURCE busmgr/bus.c diff --git a/reactos/hal/halx86/acpi.cmake b/reactos/hal/halx86/acpi.cmake index be1e8124b8f..af08c9fc18f 100644 --- a/reactos/hal/halx86/acpi.cmake +++ b/reactos/hal/halx86/acpi.cmake @@ -6,7 +6,7 @@ list(APPEND HAL_ACPI_SOURCE legacy/bus/pcibus.c) add_object_library(lib_hal_acpi ${HAL_ACPI_SOURCE}) -add_dependencies(lib_hal_acpi bugcodes) +add_dependencies(lib_hal_acpi bugcodes xdk) #add_pch(lib_hal_acpi include/hal.h) if(MSVC) diff --git a/reactos/hal/halx86/legacy.cmake b/reactos/hal/halx86/legacy.cmake index a8bf4818e8a..d60be7f5938 100644 --- a/reactos/hal/halx86/legacy.cmake +++ b/reactos/hal/halx86/legacy.cmake @@ -12,7 +12,7 @@ list(APPEND HAL_LEGACY_SOURCE legacy/halpcat.c) add_object_library(lib_hal_legacy ${HAL_LEGACY_SOURCE}) -add_dependencies(lib_hal_legacy bugcodes) +add_dependencies(lib_hal_legacy bugcodes xdk) #add_pch(lib_hal_legacy include/hal.h) if(MSVC) diff --git a/reactos/hal/halx86/up.cmake b/reactos/hal/halx86/up.cmake index 8102f1721e1..d61cc0c2c83 100644 --- a/reactos/hal/halx86/up.cmake +++ b/reactos/hal/halx86/up.cmake @@ -4,4 +4,4 @@ list(APPEND HAL_UP_SOURCE up/processor.c) add_object_library(lib_hal_up ${HAL_UP_SOURCE}) -add_dependencies(lib_hal_up bugcodes) +add_dependencies(lib_hal_up bugcodes xdk) diff --git a/reactos/lib/3rdparty/fullfat/CMakeLists.txt b/reactos/lib/3rdparty/fullfat/CMakeLists.txt index ec426f1f688..3000628dac7 100644 --- a/reactos/lib/3rdparty/fullfat/CMakeLists.txt +++ b/reactos/lib/3rdparty/fullfat/CMakeLists.txt @@ -17,7 +17,7 @@ list(APPEND SOURCE ff_time.c) add_library(fullfat ${SOURCE}) -add_dependencies(fullfat bugcodes) +add_dependencies(fullfat bugcodes xdk) if((NOT MSVC) AND (NOT CMAKE_C_COMPILER_ID STREQUAL "Clang")) add_target_compile_flags(fullfat "-Wno-unused-but-set-variable") diff --git a/reactos/lib/drivers/chew/CMakeLists.txt b/reactos/lib/drivers/chew/CMakeLists.txt index 4aed5e8a90b..62af9476935 100644 --- a/reactos/lib/drivers/chew/CMakeLists.txt +++ b/reactos/lib/drivers/chew/CMakeLists.txt @@ -1,4 +1,4 @@ add_definitions(-D_NTOSKRNL_) add_library(chew workqueue.c) -add_dependencies(chew bugcodes) +add_dependencies(chew bugcodes xdk) diff --git a/reactos/lib/drivers/csq/CMakeLists.txt b/reactos/lib/drivers/csq/CMakeLists.txt index 72bebce0d85..23451494fb3 100644 --- a/reactos/lib/drivers/csq/CMakeLists.txt +++ b/reactos/lib/drivers/csq/CMakeLists.txt @@ -1,4 +1,4 @@ add_definitions(-D_NTOSKRNL_) add_library(csq csq.c) -add_dependencies(csq bugcodes) +add_dependencies(csq bugcodes xdk) diff --git a/reactos/lib/drivers/hidparser/CMakeLists.txt b/reactos/lib/drivers/hidparser/CMakeLists.txt index 68d4ab534e3..1becfe528dc 100644 --- a/reactos/lib/drivers/hidparser/CMakeLists.txt +++ b/reactos/lib/drivers/hidparser/CMakeLists.txt @@ -9,5 +9,5 @@ list(APPEND SOURCE parser.h) add_library(hidparser ${SOURCE}) -add_dependencies(hidparser bugcodes) +add_dependencies(hidparser bugcodes xdk) add_pch(hidparser parser.h SOURCE) diff --git a/reactos/lib/drivers/ip/CMakeLists.txt b/reactos/lib/drivers/ip/CMakeLists.txt index a0e2d0eb773..000feeb5c42 100644 --- a/reactos/lib/drivers/ip/CMakeLists.txt +++ b/reactos/lib/drivers/ip/CMakeLists.txt @@ -35,4 +35,4 @@ list(APPEND SOURCE add_library(ip ${SOURCE} ${ip_asm}) add_pch(ip precomp.h SOURCE) -add_dependencies(ip bugcodes) +add_dependencies(ip asm) diff --git a/reactos/lib/drivers/libusb/CMakeLists.txt b/reactos/lib/drivers/libusb/CMakeLists.txt index 742e2d5bc82..f155267c3a2 100644 --- a/reactos/lib/drivers/libusb/CMakeLists.txt +++ b/reactos/lib/drivers/libusb/CMakeLists.txt @@ -17,5 +17,5 @@ list(APPEND SOURCE libusb.h) add_library(libusb ${SOURCE}) -add_dependencies(libusb bugcodes) +add_dependencies(libusb bugcodes xdk) add_pch(libusb libusb.h SOURCE) diff --git a/reactos/lib/drivers/lwip/CMakeLists.txt b/reactos/lib/drivers/lwip/CMakeLists.txt index 4095b863131..1075e6c1d80 100644 --- a/reactos/lib/drivers/lwip/CMakeLists.txt +++ b/reactos/lib/drivers/lwip/CMakeLists.txt @@ -59,7 +59,7 @@ list(APPEND SOURCE precomp.h) add_library(lwip ${SOURCE}) -add_dependencies(lwip bugcodes) +add_dependencies(lwip bugcodes xdk) add_pch(lwip precomp.h SOURCE) if(NOT MSVC) diff --git a/reactos/lib/drivers/sound/legacy/CMakeLists.txt b/reactos/lib/drivers/sound/legacy/CMakeLists.txt index 30624092be3..68bdbf31849 100644 --- a/reactos/lib/drivers/sound/legacy/CMakeLists.txt +++ b/reactos/lib/drivers/sound/legacy/CMakeLists.txt @@ -8,4 +8,4 @@ include_directories( ${REACTOS_SOURCE_DIR}/include/reactos/libs/sound) add_library(audioleg devname.c hardware.c) -add_dependencies(audioleg bugcodes) +add_dependencies(audioleg bugcodes xdk) diff --git a/reactos/lib/drivers/sound/libusbaudio/CMakeLists.txt b/reactos/lib/drivers/sound/libusbaudio/CMakeLists.txt index 1693c574838..b3cea42ab13 100644 --- a/reactos/lib/drivers/sound/libusbaudio/CMakeLists.txt +++ b/reactos/lib/drivers/sound/libusbaudio/CMakeLists.txt @@ -9,4 +9,4 @@ list(APPEND SOURCE format.c) add_library(libusbaudio ${SOURCE}) -add_dependencies(libusbaudio bugcodes) +add_dependencies(libusbaudio bugcodes xdk) diff --git a/reactos/lib/drivers/sound/mmixer/CMakeLists.txt b/reactos/lib/drivers/sound/mmixer/CMakeLists.txt index 91c9ab2810b..e033067629e 100644 --- a/reactos/lib/drivers/sound/mmixer/CMakeLists.txt +++ b/reactos/lib/drivers/sound/mmixer/CMakeLists.txt @@ -17,4 +17,4 @@ list(APPEND SOURCE add_library(mmixer ${SOURCE}) add_pch(mmixer precomp.h SOURCE) -add_dependencies(mmixer bugcodes) +add_dependencies(mmixer bugcodes xdk) diff --git a/reactos/lib/drivers/sound/shared/CMakeLists.txt b/reactos/lib/drivers/sound/shared/CMakeLists.txt index 8a007d83ee5..12bae5d1544 100644 --- a/reactos/lib/drivers/sound/shared/CMakeLists.txt +++ b/reactos/lib/drivers/sound/shared/CMakeLists.txt @@ -8,4 +8,4 @@ include_directories( ${REACTOS_SOURCE_DIR}/include/reactos/libs/sound) add_library(audio time.c) -add_dependencies(audio bugcodes) +add_dependencies(audio bugcodes xdk) diff --git a/reactos/lib/drivers/sound/soundblaster/CMakeLists.txt b/reactos/lib/drivers/sound/soundblaster/CMakeLists.txt index eaf49f91706..598274a2e9d 100644 --- a/reactos/lib/drivers/sound/soundblaster/CMakeLists.txt +++ b/reactos/lib/drivers/sound/soundblaster/CMakeLists.txt @@ -14,4 +14,4 @@ list(APPEND SOURCE add_library(soundblaster ${SOURCE}) add_pch(soundblaster precomp.h) -add_dependencies(soundblaster bugcodes) +add_dependencies(soundblaster bugcodes xdk) diff --git a/reactos/lib/drivers/sound/uartmidi/CMakeLists.txt b/reactos/lib/drivers/sound/uartmidi/CMakeLists.txt index 017e0af3843..2506ce067a5 100644 --- a/reactos/lib/drivers/sound/uartmidi/CMakeLists.txt +++ b/reactos/lib/drivers/sound/uartmidi/CMakeLists.txt @@ -8,4 +8,4 @@ include_directories( ${REACTOS_SOURCE_DIR}/include/reactos/libs/sound) add_library(uartmidi midiuart.c) -add_dependencies(uartmidi bugcodes) +add_dependencies(uartmidi bugcodes xdk) diff --git a/reactos/subsystems/win/basesrv/CMakeLists.txt b/reactos/subsystems/win/basesrv/CMakeLists.txt index bf7aa82ae97..3ec1386f0be 100644 --- a/reactos/subsystems/win/basesrv/CMakeLists.txt +++ b/reactos/subsystems/win/basesrv/CMakeLists.txt @@ -27,5 +27,5 @@ set_subsystem(basesrv console) target_link_libraries(basesrv ${PSEH_LIB}) add_importlibs(basesrv csrsrv ntdll) add_pch(basesrv basesrv.h SOURCE) -add_dependencies(basesrv bugcodes) +add_dependencies(basesrv bugcodes xdk) add_cd_file(TARGET basesrv DESTINATION reactos/system32 FOR all) diff --git a/reactos/win32ss/user/winsrv/CMakeLists.txt b/reactos/win32ss/user/winsrv/CMakeLists.txt index efa7f01866a..7933fd9d43d 100644 --- a/reactos/win32ss/user/winsrv/CMakeLists.txt +++ b/reactos/win32ss/user/winsrv/CMakeLists.txt @@ -31,5 +31,5 @@ target_link_libraries(winsrv ${CONSRV_TARGET_LINK_LIBS} win32ksys libcntpr ${PSE add_delay_importlibs(winsrv ${CONSRV_DELAY_IMPORT_LIBS} advapi32) add_importlibs(winsrv ${CONSRV_IMPORT_LIBS} ${USERSRV_IMPORT_LIBS} csrsrv gdi32 user32 kernel32 ntdll) -add_dependencies(winsrv bugcodes) +add_dependencies(winsrv bugcodes xdk) add_cd_file(TARGET winsrv DESTINATION reactos/system32 FOR all) diff --git a/rostests/kmtests/CMakeLists.txt b/rostests/kmtests/CMakeLists.txt index 02c6b231793..128933e8d08 100644 --- a/rostests/kmtests/CMakeLists.txt +++ b/rostests/kmtests/CMakeLists.txt @@ -84,7 +84,7 @@ add_library(kmtest_drv SHARED ${KMTEST_DRV_SOURCE}) set_module_type(kmtest_drv kernelmodedriver) target_link_libraries(kmtest_drv kmtest_printf chkstk ${PSEH_LIB}) add_importlibs(kmtest_drv ntoskrnl hal) -add_dependencies(kmtest_drv bugcodes) +add_dependencies(kmtest_drv bugcodes xdk) add_target_compile_definitions(kmtest_drv KMT_KERNEL_MODE NTDDI_VERSION=NTDDI_WS03SP1) #add_pch(kmtest_drv include/kmt_test.h) add_cd_file(TARGET kmtest_drv DESTINATION reactos/bin FOR all)