From 03c55fa9115b236f8a5226773395bfa90c9ff88a Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Wed, 28 Sep 2011 11:13:53 +0000 Subject: [PATCH] [CMAKE] * Don't detect the ASM compiler ID, we set it instead. svn path=/trunk/; revision=53882 --- reactos/toolchain-gcc.cmake | 1 + reactos/toolchain-msvc.cmake | 1 + 2 files changed, 2 insertions(+) diff --git a/reactos/toolchain-gcc.cmake b/reactos/toolchain-gcc.cmake index d955e985a33..73713ae5d8e 100644 --- a/reactos/toolchain-gcc.cmake +++ b/reactos/toolchain-gcc.cmake @@ -38,6 +38,7 @@ set(CMAKE_SYSTEM_PROCESSOR i686) set(CMAKE_C_COMPILER ${MINGW_TOOLCHAIN_PREFIX}gcc${MINGW_TOOLCHAIN_SUFFIX}) set(CMAKE_CXX_COMPILER ${MINGW_TOOLCHAIN_PREFIX}g++${MINGW_TOOLCHAIN_SUFFIX}) set(CMAKE_ASM_COMPILER ${MINGW_TOOLCHAIN_PREFIX}gcc${MINGW_TOOLCHAIN_SUFFIX}) +set(CMAKE_ASM_COMPILER_ID "GNU") set(CMAKE_MC_COMPILER ${MINGW_TOOLCHAIN_PREFIX}windmc) set(CMAKE_RC_COMPILER ${MINGW_TOOLCHAIN_PREFIX}windres) set(CMAKE_DLLTOOL ${MINGW_TOOLCHAIN_PREFIX}dlltool) diff --git a/reactos/toolchain-msvc.cmake b/reactos/toolchain-msvc.cmake index d46476affd8..3b675f2de69 100644 --- a/reactos/toolchain-msvc.cmake +++ b/reactos/toolchain-msvc.cmake @@ -12,6 +12,7 @@ if(${ARCH} MATCHES amd64) else() set(CMAKE_ASM_COMPILER ml) endif() +set(CMAKE_ASM_COMPILER_ID "VISUAL") set(CMAKE_C_STANDARD_LIBRARIES "" CACHE INTERNAL "")