Some places already use ARCH_SOURCES_DIR for things like include_directories but others test the platform/arch variables to figure out the dir. Use ARCH_SOURCES_DIR everywhere for consistency.
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")
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")
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")
add_subdirectory(nls)
add_subdirectory(cryptography)
endif(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)
if(CLR_CMAKE_PLATFORM_ARCH_AMD64)
set(CORDBDI_SOURCES
${CORDBDI_SOURCES}
- amd64/floatconversion.S
+ ${ARCH_SOURCES_DIR}/floatconversion.S
)
endif()
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})
-
if (WIN32)
add_precompiled_header(stdafx.h ../stdafx.cpp CORDBEE_SOURCES_WKS)
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()
-
set(CMAKE_INCLUDE_CURRENT_DIR ON)
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)
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()