Author: akhaldi
Date: Wed Sep 28 11:13:53 2011
New Revision: 53882
URL:
http://svn.reactos.org/svn/reactos?rev=53882&view=rev
Log:
[CMAKE]
* Don't detect the ASM compiler ID, we set it instead.
Modified:
trunk/reactos/toolchain-gcc.cmake
trunk/reactos/toolchain-msvc.cmake
Modified: trunk/reactos/toolchain-gcc.cmake
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/toolchain-gcc.cmake?rev=53…
==============================================================================
--- trunk/reactos/toolchain-gcc.cmake [iso-8859-1] (original)
+++ trunk/reactos/toolchain-gcc.cmake [iso-8859-1] Wed Sep 28 11:13:53 2011
@@ -38,6 +38,7 @@
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)
Modified: trunk/reactos/toolchain-msvc.cmake
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/toolchain-msvc.cmake?rev=5…
==============================================================================
--- trunk/reactos/toolchain-msvc.cmake [iso-8859-1] (original)
+++ trunk/reactos/toolchain-msvc.cmake [iso-8859-1] Wed Sep 28 11:13:53 2011
@@ -12,6 +12,7 @@
else()
set(CMAKE_ASM_COMPILER ml)
endif()
+set(CMAKE_ASM_COMPILER_ID "VISUAL")
set(CMAKE_C_STANDARD_LIBRARIES "" CACHE INTERNAL "")