https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9cc4d8994bb471d5e6aa1…
commit 9cc4d8994bb471d5e6aa1de6308bbf4a5015e479
Author: Timo Kreuzer <timo.kreuzer(a)reactos.org>
AuthorDate: Sat Oct 28 22:20:36 2023 +0300
Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org>
CommitDate: Fri Nov 10 19:20:24 2023 +0200
[CMAKE] Use baseaddress64.cmake for all 64 bit builds
- Rename baseaddress_msvc_x64.cmake to baseaddress64.cmake
- Include it for all compilers and 64 bit architectures
---
CMakeLists.txt | 10 ++++------
sdk/cmake/{baseaddress_msvc_x64.cmake => baseaddress64.cmake} | 0
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 12dd07e5085..3583b78b894 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -336,14 +336,12 @@ Enable this if the module uses typeid or dynamic_cast. You will probably need to
add_subdirectory(sdk/include/reactos/mc)
add_subdirectory(sdk/include/asm)
- if(NO_ROSSYM)
+ if(ARCH MATCHES "64$")
+ include(sdk/cmake/baseaddress64.cmake)
+ elseif(NO_ROSSYM)
include(sdk/cmake/baseaddress_dwarf.cmake)
elseif(MSVC)
- if (ARCH STREQUAL "amd64")
- include(sdk/cmake/baseaddress_msvc_x64.cmake)
- else()
- include(sdk/cmake/baseaddress_msvc.cmake)
- endif()
+ include(sdk/cmake/baseaddress_msvc.cmake)
else()
include(sdk/cmake/baseaddress.cmake)
endif()
diff --git a/sdk/cmake/baseaddress_msvc_x64.cmake b/sdk/cmake/baseaddress64.cmake
similarity index 100%
rename from sdk/cmake/baseaddress_msvc_x64.cmake
rename to sdk/cmake/baseaddress64.cmake