[reactos] 01/01: [MSI_WINETEST][BASEADDRESS] Rename the 'custom' and 'selfreg' build targets.
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6c93f3ca6b95fa5e1806fc...
commit 6c93f3ca6b95fa5e1806fc29295d3bc8ada979f9 Author: Hermès Bélusca-Maïto hermes.belusca-maito@reactos.org AuthorDate: Wed Dec 27 21:50:24 2023 +0100 Commit: Hermès Bélusca-Maïto hermes.belusca-maito@reactos.org CommitDate: Wed Dec 27 21:50:32 2023 +0100
[MSI_WINETEST][BASEADDRESS] Rename the 'custom' and 'selfreg' build targets.
They are renamed to 'msi_custom' and 'msi_selfreg', respectively. This is to avoid any future build target name collisions with other tests that would also use similarly-named targets. (For example, a future setupapi wine-synced commit.) --- modules/rostests/winetests/msi/CMakeLists.txt | 22 ++++++++++++---------- sdk/cmake/baseaddress.cmake | 4 ++-- sdk/cmake/baseaddress64.cmake | 4 ++-- sdk/cmake/baseaddress_dwarf.cmake | 2 +- sdk/cmake/baseaddress_msvc.cmake | 4 ++-- 5 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/modules/rostests/winetests/msi/CMakeLists.txt b/modules/rostests/winetests/msi/CMakeLists.txt index 631c09abc15..7d08f5211de 100644 --- a/modules/rostests/winetests/msi/CMakeLists.txt +++ b/modules/rostests/winetests/msi/CMakeLists.txt @@ -1,14 +1,16 @@
spec2def(custom.dll custom.spec) -add_library(custom MODULE custom.c ${CMAKE_CURRENT_BINARY_DIR}/custom.def) -target_link_libraries(custom uuid) -set_module_type(custom win32dll) -add_importlibs(custom msi ole32 oleaut32 odbccp32 shell32 advapi32 msvcrt kernel32) +add_library(msi_custom MODULE custom.c ${CMAKE_CURRENT_BINARY_DIR}/custom.def) +set_target_properties(msi_custom PROPERTIES OUTPUT_NAME "custom") +target_link_libraries(msi_custom uuid) +set_module_type(msi_custom win32dll) +add_importlibs(msi_custom msi ole32 oleaut32 odbccp32 shell32 advapi32 msvcrt kernel32)
spec2def(selfreg.dll selfreg.spec) -add_library(selfreg MODULE selfreg.c ${CMAKE_CURRENT_BINARY_DIR}/selfreg.def) -set_module_type(selfreg win32dll) -add_importlibs(selfreg advapi32 msvcrt kernel32) +add_library(msi_selfreg MODULE selfreg.c ${CMAKE_CURRENT_BINARY_DIR}/selfreg.def) +set_target_properties(msi_selfreg PROPERTIES OUTPUT_NAME "selfreg") +set_module_type(msi_selfreg win32dll) +add_importlibs(msi_selfreg advapi32 msvcrt kernel32)
list(APPEND SOURCE action.c @@ -45,12 +47,12 @@ target_compile_definitions(msi_winetest PRIVATE __WINESRC__ USE_WINE_TODOS)
if(CMAKE_C_COMPILER_ID STREQUAL "GNU") target_compile_options(msi_winetest PRIVATE -Wno-format-overflow -Wno-format) - target_compile_options(custom PRIVATE -Wno-format) + target_compile_options(msi_custom PRIVATE -Wno-format) endif()
# msi_winetest.rc: let rc.exe find custom.dll in its subdirectory, i.e. Debug. if (MSVC_IDE) - target_include_directories(msi_winetest PRIVATE $<$<COMPILE_LANGUAGE:RC>:$<TARGET_FILE_DIR:custom>>) + target_include_directories(msi_winetest PRIVATE $<$<COMPILE_LANGUAGE:RC>:$<TARGET_FILE_DIR:msi_custom>>) endif()
target_link_libraries(msi_winetest uuid) @@ -58,4 +60,4 @@ set_module_type(msi_winetest win32cui) add_importlibs(msi_winetest secur32 cabinet msi shell32 ole32 oleaut32 odbccp32 user32 advapi32 version msvcrt kernel32) add_pch(msi_winetest precomp.h "${PCH_SKIP_SOURCE}") add_rostests_file(TARGET msi_winetest) -add_dependencies(msi_winetest custom selfreg msi_winetest_idlheader stdole2) +add_dependencies(msi_winetest msi_custom msi_selfreg msi_winetest_idlheader stdole2) diff --git a/sdk/cmake/baseaddress.cmake b/sdk/cmake/baseaddress.cmake index 3cbeef488a1..ce1861f2115 100644 --- a/sdk/cmake/baseaddress.cmake +++ b/sdk/cmake/baseaddress.cmake @@ -102,7 +102,7 @@ set(baseaddress_cryptdlg 0x78a60000) set(baseaddress_cryptdll 0x78a30000) set(baseaddress_cryptext 0x78a00000) set(baseaddress_cryptnet 0x789d0000) -set(baseaddress_custom 0x78990000) +set(baseaddress_msi_custom 0x78990000) set(baseaddress_d3d8 0x78930000) set(baseaddress_d3d8thk 0x78910000) set(baseaddress_d3d9 0x788a0000) @@ -308,7 +308,7 @@ set(baseaddress_schedsvc 0x72100000) set(baseaddress_scrrun 0x720a0000) set(baseaddress_seclogon 0x72070000) set(baseaddress_security 0x72050000) -set(baseaddress_selfreg 0x72020000) +set(baseaddress_msi_selfreg 0x72020000) set(baseaddress_sendmail 0x71fd0000) set(baseaddress_serialui 0x71fa0000) set(baseaddress_sfc 0x71f70000) diff --git a/sdk/cmake/baseaddress64.cmake b/sdk/cmake/baseaddress64.cmake index 81fe48272ee..ffc1a2381b2 100644 --- a/sdk/cmake/baseaddress64.cmake +++ b/sdk/cmake/baseaddress64.cmake @@ -101,7 +101,7 @@ set(baseaddress_cryptdlg 0x7ff57000000) set(baseaddress_cryptdll 0x7ff56000000) set(baseaddress_cryptext 0x7ff55000000) set(baseaddress_cryptnet 0x7ff54000000) -set(baseaddress_custom 0x7ff53000000) +set(baseaddress_msi_custom 0x7ff53000000) set(baseaddress_d3d8 0x7ff52000000) set(baseaddress_d3d8thk 0x7ff51000000) set(baseaddress_d3d9 0x7ff50000000) @@ -307,7 +307,7 @@ set(baseaddress_schedsvc 0x7fe89000000) set(baseaddress_scrrun 0x7fe88000000) set(baseaddress_seclogon 0x7fe87000000) set(baseaddress_security 0x7fe86000000) -set(baseaddress_selfreg 0x7fe85000000) +set(baseaddress_msi_selfreg 0x7fe85000000) set(baseaddress_sendmail 0x7fe84000000) set(baseaddress_serialui 0x7fe83000000) set(baseaddress_sfc 0x7fe82000000) diff --git a/sdk/cmake/baseaddress_dwarf.cmake b/sdk/cmake/baseaddress_dwarf.cmake index 3ddc970ad77..97bdde2a3de 100644 --- a/sdk/cmake/baseaddress_dwarf.cmake +++ b/sdk/cmake/baseaddress_dwarf.cmake @@ -100,7 +100,7 @@ set(baseaddress_cryptdlg 0x768c0000) set(baseaddress_cryptdll 0x76880000) set(baseaddress_cryptext 0x76840000) set(baseaddress_cryptnet 0x767f0000) -set(baseaddress_custom 0x767b0000) +set(baseaddress_msi_custom 0x767b0000) set(baseaddress_d3d8 0x76710000) set(baseaddress_d3d8thk 0x766f0000) set(baseaddress_d3d9 0x76630000) diff --git a/sdk/cmake/baseaddress_msvc.cmake b/sdk/cmake/baseaddress_msvc.cmake index d1dced9f17b..64171c892f7 100644 --- a/sdk/cmake/baseaddress_msvc.cmake +++ b/sdk/cmake/baseaddress_msvc.cmake @@ -102,7 +102,7 @@ set(baseaddress_cryptdlg 0x79c30000) set(baseaddress_cryptdll 0x79c10000) set(baseaddress_cryptext 0x79bf0000) set(baseaddress_cryptnet 0x79bc0000) -set(baseaddress_custom 0x79b90000) +set(baseaddress_msi_custom 0x79b90000) set(baseaddress_d3d8 0x79b50000) set(baseaddress_d3d8thk 0x79b30000) set(baseaddress_d3d9 0x79ae0000) @@ -308,7 +308,7 @@ set(baseaddress_schedsvc 0x75390000) set(baseaddress_scrrun 0x75350000) set(baseaddress_seclogon 0x75330000) set(baseaddress_security 0x75310000) -set(baseaddress_selfreg 0x752f0000) +set(baseaddress_msi_selfreg 0x752f0000) set(baseaddress_sendmail 0x752c0000) set(baseaddress_serialui 0x752a0000) set(baseaddress_sfc 0x75280000)
-
Hermès Bélusca-Maïto