[CMAKE]

* Don't detect the ASM compiler ID, we set it instead.

svn path=/trunk/; revision=53882

diff --git a/reactos/toolchain-gcc.cmake b/reactos/toolchain-gcc.cmake
index d955e98..73713ae 100644 (file)
--- 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 d46476a..3b675f2 100644 (file)
--- 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 "")