summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/CMakeLists.txt14
-rw-r--r--src/binder/CMakeLists.txt13
-rw-r--r--src/classlibnative/CMakeLists.txt13
-rw-r--r--src/debug/di/CMakeLists.txt4
-rw-r--r--src/debug/ee/CMakeLists.txt8
-rw-r--r--src/debug/ee/wks/CMakeLists.txt5
-rw-r--r--src/gcinfo/CMakeLists.txt3
-rw-r--r--src/vm/crossgen/CMakeLists.txt13
8 files changed, 17 insertions, 56 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d1087d83e4..5815ca1532 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -2,20 +2,8 @@ include_directories($ENV{__GeneratedIntermediatesDir}/inc)
include_directories("inc")
include_directories("strongname/inc")
include_directories("inc/winrt")
-
include_directories("debug/inc")
-if(CLR_CMAKE_PLATFORM_ARCH_AMD64)
- include_directories("debug/inc/amd64")
-elseif(CLR_CMAKE_PLATFORM_ARCH_I386)
- include_directories("debug/inc/i386")
-elseif(CLR_CMAKE_PLATFORM_ARCH_ARM)
- include_directories("debug/inc/arm")
-elseif(CLR_CMAKE_PLATFORM_ARCH_ARM64)
- include_directories("debug/inc/arm64")
-else()
- clr_unknown_arch()
-endif()
-
+include_directories("debug/inc/${ARCH_SOURCES_DIR}")
include_directories("debug/inc/dump")
include_directories("md/inc")
include_directories("classlibnative/bcltype")
diff --git a/src/binder/CMakeLists.txt b/src/binder/CMakeLists.txt
index 9026958ab1..7180623f00 100644
--- a/src/binder/CMakeLists.txt
+++ b/src/binder/CMakeLists.txt
@@ -1,16 +1,5 @@
set(CMAKE_INCLUDE_CURRENT_DIR ON)
-
-if(CLR_CMAKE_PLATFORM_ARCH_AMD64)
- include_directories(BEFORE "../vm/amd64")
-elseif(CLR_CMAKE_PLATFORM_ARCH_I386)
- include_directories(BEFORE "../vm/i386")
-elseif(CLR_CMAKE_PLATFORM_ARCH_ARM)
- include_directories(BEFORE "../vm/arm")
-elseif(CLR_CMAKE_PLATFORM_ARCH_ARM64)
- include_directories(BEFORE "../vm/arm64")
-else()
- clr_unknown_arch()
-endif()
+include_directories(BEFORE "../vm/${ARCH_SOURCES_DIR}")
include_directories(BEFORE "../vm")
include_directories(BEFORE "inc")
diff --git a/src/classlibnative/CMakeLists.txt b/src/classlibnative/CMakeLists.txt
index 5dce8609fb..c2cf106cfe 100644
--- a/src/classlibnative/CMakeLists.txt
+++ b/src/classlibnative/CMakeLists.txt
@@ -1,16 +1,6 @@
include_directories(BEFORE "../vm")
include_directories("../inc")
-if(CLR_CMAKE_PLATFORM_ARCH_AMD64)
- include_directories(BEFORE "../vm/amd64")
-elseif(CLR_CMAKE_PLATFORM_ARCH_I386)
- include_directories(BEFORE "../vm/i386")
-elseif(CLR_CMAKE_PLATFORM_ARCH_ARM)
- include_directories(BEFORE "../vm/arm")
-elseif(CLR_CMAKE_PLATFORM_ARCH_ARM64)
- include_directories(BEFORE "../vm/arm64")
-else()
- clr_unknown_arch()
-endif()
+include_directories(BEFORE "../vm/${ARCH_SOURCES_DIR}")
include_directories("../debug/inc")
include_directories("../debug/inc/dump")
@@ -41,4 +31,3 @@ if(WIN32)
add_subdirectory(nls)
add_subdirectory(cryptography)
endif(WIN32)
-
diff --git a/src/debug/di/CMakeLists.txt b/src/debug/di/CMakeLists.txt
index 17b737107d..925f356a3a 100644
--- a/src/debug/di/CMakeLists.txt
+++ b/src/debug/di/CMakeLists.txt
@@ -61,7 +61,7 @@ if(WIN32)
if (CLR_CMAKE_PLATFORM_ARCH_AMD64)
set(CORDBDI_SOURCES
${CORDBDI_SOURCES}
- amd64/floatconversion.asm
+ ${ARCH_SOURCES_DIR}/floatconversion.asm
)
endif()
elseif(CLR_CMAKE_PLATFORM_UNIX)
@@ -70,7 +70,7 @@ elseif(CLR_CMAKE_PLATFORM_UNIX)
if(CLR_CMAKE_PLATFORM_ARCH_AMD64)
set(CORDBDI_SOURCES
${CORDBDI_SOURCES}
- amd64/floatconversion.S
+ ${ARCH_SOURCES_DIR}/floatconversion.S
)
endif()
diff --git a/src/debug/ee/CMakeLists.txt b/src/debug/ee/CMakeLists.txt
index 007b0ff0c5..179bf71172 100644
--- a/src/debug/ee/CMakeLists.txt
+++ b/src/debug/ee/CMakeLists.txt
@@ -65,17 +65,17 @@ endif(CLR_CMAKE_PLATFORM_UNIX)
if(CLR_CMAKE_PLATFORM_ARCH_AMD64)
list(APPEND CORDBEE_SOURCES_WKS
${ARCH_SOURCES_DIR}/debuggerregdisplayhelper.cpp
+ ${ARCH_SOURCES_DIR}/amd64walker.cpp
)
- list(APPEND CORDBEE_SOURCES_WKS amd64/amd64walker.cpp)
elseif(CLR_CMAKE_PLATFORM_ARCH_I386)
list(APPEND CORDBEE_SOURCES_WKS
${ARCH_SOURCES_DIR}/debuggerregdisplayhelper.cpp
+ ${ARCH_SOURCES_DIR}/x86walker.cpp
)
- list(APPEND CORDBEE_SOURCES_WKS i386/x86walker.cpp)
elseif(CLR_CMAKE_PLATFORM_ARCH_ARM)
- list(APPEND CORDBEE_SOURCES_WKS arm/armwalker.cpp)
+ list(APPEND CORDBEE_SOURCES_WKS ${ARCH_SOURCES_DIR}/armwalker.cpp)
elseif(CLR_CMAKE_PLATFORM_ARCH_ARM64)
- list(APPEND CORDBEE_SOURCES_WKS arm64/arm64walker.cpp)
+ list(APPEND CORDBEE_SOURCES_WKS ${ARCH_SOURCES_DIR}/arm64walker.cpp)
endif()
convert_to_absolute_path(CORDBEE_SOURCES_DAC ${CORDBEE_SOURCES_DAC})
diff --git a/src/debug/ee/wks/CMakeLists.txt b/src/debug/ee/wks/CMakeLists.txt
index 77fe9980c4..79152ce404 100644
--- a/src/debug/ee/wks/CMakeLists.txt
+++ b/src/debug/ee/wks/CMakeLists.txt
@@ -1,4 +1,3 @@
-
if (WIN32)
add_precompiled_header(stdafx.h ../stdafx.cpp CORDBEE_SOURCES_WKS)
@@ -30,9 +29,9 @@ else ()
add_compile_options(-fPIC)
if(CLR_CMAKE_PLATFORM_ARCH_AMD64)
- add_library(cordbee_wks ${CORDBEE_SOURCES_WKS} ../amd64/dbghelpers.S)
+ add_library(cordbee_wks ${CORDBEE_SOURCES_WKS} ../${ARCH_SOURCES_DIR}/dbghelpers.S)
elseif(CLR_CMAKE_PLATFORM_ARCH_ARM)
- add_library(cordbee_wks ${CORDBEE_SOURCES_WKS} ../arm/dbghelpers.S)
+ add_library(cordbee_wks ${CORDBEE_SOURCES_WKS} ../${ARCH_SOURCES_DIR}/dbghelpers.S)
elseif(CLR_CMAKE_PLATFORM_ARCH_ARM64)
add_library(cordbee_wks ${CORDBEE_SOURCES_WKS})
else()
diff --git a/src/gcinfo/CMakeLists.txt b/src/gcinfo/CMakeLists.txt
index 5a872c811d..d8b91d11f0 100644
--- a/src/gcinfo/CMakeLists.txt
+++ b/src/gcinfo/CMakeLists.txt
@@ -1,4 +1,3 @@
-
set(CMAKE_INCLUDE_CURRENT_DIR ON)
set( GCINFO_SOURCES
@@ -9,7 +8,7 @@ set( GCINFO_SOURCES
if(CLR_CMAKE_PLATFORM_ARCH_I386)
list(APPEND GCINFO_SOURCES
../gcdump/gcdump.cpp
- ../gcdump/i386/gcdumpx86.cpp
+ ../gcdump/${ARCH_SOURCES_DIR}/gcdumpx86.cpp
)
endif(CLR_CMAKE_PLATFORM_ARCH_I386)
diff --git a/src/vm/crossgen/CMakeLists.txt b/src/vm/crossgen/CMakeLists.txt
index 5bed67918a..a1f1362346 100644
--- a/src/vm/crossgen/CMakeLists.txt
+++ b/src/vm/crossgen/CMakeLists.txt
@@ -105,27 +105,24 @@ endif(FEATURE_READYTORUN)
include_directories(BEFORE ..)
include_directories(${CLR_DIR}/src/gc)
+include_directories(../${ARCH_SOURCES_DIR})
if(CLR_CMAKE_PLATFORM_ARCH_AMD64)
- include_directories(../amd64)
list(APPEND VM_CROSSGEN_SOURCES
- ../amd64/stublinkeramd64.cpp
+ ../${ARCH_SOURCES_DIR}/stublinkeramd64.cpp
)
elseif(CLR_CMAKE_PLATFORM_ARCH_I386)
- include_directories(../i386)
list(APPEND VM_CROSSGEN_SOURCES
- ../i386/stublinkerx86.cpp
+ ../${ARCH_SOURCES_DIR}/stublinkerx86.cpp
../gcdecode.cpp
)
elseif(CLR_CMAKE_PLATFORM_ARCH_ARM)
- include_directories(../arm)
list(APPEND VM_CROSSGEN_SOURCES
- ../arm/stubs.cpp
+ ../${ARCH_SOURCES_DIR}/stubs.cpp
)
elseif(CLR_CMAKE_PLATFORM_ARCH_ARM64)
- include_directories(../arm64)
list(APPEND VM_CROSSGEN_SOURCES
- ../arm64/stubs.cpp
+ ../${ARCH_SOURCES_DIR}/stubs.cpp
)
else()
clr_unknown_arch()
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-04 05:23:27 +0000