diff options
| author | Gaurav Khanna <gkhanna@microsoft.com> | 2016-08-22 09:45:43 -0700 |
|---|---|---|
| committer | Gaurav Khanna <gkhanna@microsoft.com> | 2016-08-23 22:54:56 -0700 |
| commit | ad7c799eb9a2ae1e7371c75655d4b244e196b239 (patch) | |
| tree | c2277470b41fce032020eab4a85dbcda5ad82fdc /CMakeLists.txt | |
| parent | d7821eb792915fa64ff6219c7ce4b9abc195ab7e (diff) | |
| download | coreclr-ad7c799eb9a2ae1e7371c75655d4b244e196b239.tar.gz coreclr-ad7c799eb9a2ae1e7371c75655d4b244e196b239.tar.bz2 coreclr-ad7c799eb9a2ae1e7371c75655d4b244e196b239.zip | |
Initial commit to build Win32 Arm CoreCLR
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 56c22838df..ab86511a0e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,6 +11,10 @@ project(CoreCLR) # Include cmake functions include(functions.cmake) +message(STATUS "CMAKE_VS_PLATFORM_TOOLSET is ${CMAKE_VS_PLATFORM_TOOLSET}") +message(STATUS "CMAKE_VS_PLATFORM_NAME is ${CMAKE_VS_PLATFORM_NAME}") +message(STATUS "CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION is ${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}") + # Set commonly used directory names set(CLR_DIR ${CMAKE_CURRENT_SOURCE_DIR}) set(VM_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/vm) @@ -33,7 +37,19 @@ endif() # Ensure other tools are present if (WIN32) - enable_language(ASM_MASM) + if(CLR_CMAKE_HOST_ARCH STREQUAL arm) + # Explicitly specify the assembler to be used for Arm32 compile + file(TO_CMAKE_PATH "$ENV{VCINSTALLDIR}\\bin\\x86_arm\\armasm.exe" CMAKE_ASM_COMPILER) + + set(CMAKE_ASM_MASM_COMPILER ${CMAKE_ASM_COMPILER}) + message(CMAKE_ASM_MASM_COMPILER explicitly set to: ${CMAKE_ASM_MASM_COMPILER}) + + # Enable generic assembly compilation to avoid CMake generate VS proj files that explicitly + # use ml[64].exe as the assembler. + enable_language(ASM) + else() + enable_language(ASM_MASM) + endif() # Ensure that MC is present find_program(MC mc) @@ -186,6 +202,8 @@ elseif(WIN32) set(CLR_CMAKE_PLATFORM_ARCH_AMD64 1) elseif(CLR_CMAKE_HOST_ARCH STREQUAL x86) set(CLR_CMAKE_PLATFORM_ARCH_I386 1) + elseif(CLR_CMAKE_HOST_ARCH STREQUAL arm) + set(CLR_CMAKE_PLATFORM_ARCH_ARM 1) elseif(CLR_CMAKE_HOST_ARCH STREQUAL arm64) set(CLR_CMAKE_PLATFORM_ARCH_ARM64 1) else() @@ -542,4 +560,4 @@ if(CLR_CMAKE_BUILD_TESTS) add_subdirectory(tests) endif(CLR_CMAKE_BUILD_TESTS) -include(definitionsconsistencycheck.cmake) +include(definitionsconsistencycheck.cmake)
\ No newline at end of file |