https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2c895c986ffb7df63c4a8845e7786d660f3c121c
commit 2c895c986ffb7df63c4a8845e7786d660f3c121c Author: Serge Gautherie <32623169+sergegauthe...@users.noreply.github.com> AuthorDate: Sun Jan 14 16:07:00 2024 +0100 Commit: GitHub <nore...@github.com> CommitDate: Sun Jan 14 16:07:00 2024 +0100 [CMAKE][WIN32U_APITEST] Remove 3 useless 'set_module_type(... IMAGEBASE default)' (#6328) And add an explicit documentation comment. Addendum to commit 2b7246fd3. --- modules/rostests/apitests/win32u/win32u_2k3sp2/CMakeLists.txt | 2 +- modules/rostests/apitests/win32u/win32u_vista/CMakeLists.txt | 2 +- modules/rostests/apitests/win32u/win32u_xpsp2/CMakeLists.txt | 2 +- sdk/cmake/CMakeMacros.cmake | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/rostests/apitests/win32u/win32u_2k3sp2/CMakeLists.txt b/modules/rostests/apitests/win32u/win32u_2k3sp2/CMakeLists.txt index 8c086a367a4..021fba309c2 100644 --- a/modules/rostests/apitests/win32u/win32u_2k3sp2/CMakeLists.txt +++ b/modules/rostests/apitests/win32u/win32u_2k3sp2/CMakeLists.txt @@ -7,5 +7,5 @@ add_library(win32u_2k3sp2 MODULE ${win32u_2k3sp2_asm} ${CMAKE_CURRENT_BINARY_DIR}/win32u_2k3sp2.def) -set_module_type(win32u_2k3sp2 module IMAGEBASE default) +set_module_type(win32u_2k3sp2 module) add_dependencies(win32u_2k3sp2 psdk) diff --git a/modules/rostests/apitests/win32u/win32u_vista/CMakeLists.txt b/modules/rostests/apitests/win32u/win32u_vista/CMakeLists.txt index 743ded25e1f..38737886d0c 100644 --- a/modules/rostests/apitests/win32u/win32u_vista/CMakeLists.txt +++ b/modules/rostests/apitests/win32u/win32u_vista/CMakeLists.txt @@ -7,5 +7,5 @@ add_library(win32u_vista MODULE ${win32u_vista_asm} ${CMAKE_CURRENT_BINARY_DIR}/win32u_vista.def) -set_module_type(win32u_vista module IMAGEBASE default) +set_module_type(win32u_vista module) add_dependencies(win32u_vista psdk) diff --git a/modules/rostests/apitests/win32u/win32u_xpsp2/CMakeLists.txt b/modules/rostests/apitests/win32u/win32u_xpsp2/CMakeLists.txt index 6939993703a..457d5c1868a 100644 --- a/modules/rostests/apitests/win32u/win32u_xpsp2/CMakeLists.txt +++ b/modules/rostests/apitests/win32u/win32u_xpsp2/CMakeLists.txt @@ -7,5 +7,5 @@ add_library(win32u_xpsp2 MODULE ${win32u_xpsp2_asm} ${CMAKE_CURRENT_BINARY_DIR}/win32u_xpsp2.def) -set_module_type(win32u_xpsp2 module IMAGEBASE default) +set_module_type(win32u_xpsp2 module) add_dependencies(win32u_xpsp2 psdk) diff --git a/sdk/cmake/CMakeMacros.cmake b/sdk/cmake/CMakeMacros.cmake index 6fcf476da69..802979c2422 100644 --- a/sdk/cmake/CMakeMacros.cmake +++ b/sdk/cmake/CMakeMacros.cmake @@ -642,6 +642,7 @@ function(set_module_type MODULE TYPE) endif() # Set base address + # Use 'IMAGEBASE default' to skip these set_image_base(), especially for win32dll test files if(__module_IMAGEBASE) if(NOT ${__module_IMAGEBASE} STREQUAL "default") set_image_base(${MODULE} ${__module_IMAGEBASE})