[ros-diffs] [akhaldi] 57152: [CMAKE/MSVC] * Call cl directly instead of its full path using <CMAKE_C_COMPILER>. Figuring out why it didn't work is left as an exercise for the reader.

Author: akhaldi
Date: Fri Aug 24 16:21:33 2012
New Revision: 57152

URL: http://svn.reactos.org/svn/reactos?rev=57152&view=rev
Log:
[CMAKE/MSVC]
* Call cl directly instead of its full path using <CMAKE_C_COMPILER>. Figuring out
why it didn't work is left as an exercise for the reader.

Modified:
    trunk/reactos/cmake/msvc.cmake

Modified: trunk/reactos/cmake/msvc.cmake
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=57152…
==============================================================================
--- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original)
+++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Fri Aug 24 16:21:33 2012
@@ -53,12 +53,12 @@
     # We may temporarily use just the global defines, but this is not a solution as some
modules (minihal for example) apply additional definitions to source files, so we get an
incorrect build of such targets.
     get_directory_property(definitions DEFINITIONS)
     set(CMAKE_ASM_COMPILE_OBJECT
-        "<CMAKE_C_COMPILER> /nologo /X /I${REACTOS_SOURCE_DIR}/include/asm
/I${REACTOS_BINARY_DIR}/include/asm <FLAGS> ${definitions} /D__ASM__ /D_USE_ML /EP
/c <SOURCE> > <OBJECT>.tmp"
+        "cl /nologo /X /I${REACTOS_SOURCE_DIR}/include/asm
/I${REACTOS_BINARY_DIR}/include/asm <FLAGS> ${definitions} /D__ASM__ /D_USE_ML /EP
/c <SOURCE> > <OBJECT>.tmp"
         "<CMAKE_ASM_COMPILER> /nologo /Cp /Fo<OBJECT> /c /Ta
<OBJECT>.tmp")
 else()
     # NMake Makefiles
     set(CMAKE_ASM_COMPILE_OBJECT
-        "<CMAKE_C_COMPILER> /nologo /X /I${REACTOS_SOURCE_DIR}/include/asm
/I${REACTOS_BINARY_DIR}/include/asm <FLAGS> <DEFINES> /D__ASM__ /D_USE_ML /EP
/c <SOURCE> > <OBJECT>.tmp"
+        "cl /nologo /X /I${REACTOS_SOURCE_DIR}/include/asm
/I${REACTOS_BINARY_DIR}/include/asm <FLAGS> <DEFINES> /D__ASM__ /D_USE_ML /EP
/c <SOURCE> > <OBJECT>.tmp"
         "<CMAKE_ASM_COMPILER> /nologo /Cp /Fo<OBJECT> /c /Ta
<OBJECT>.tmp")
 endif()