From 67e321c158d4bfd53de535e14156e6daba0572d1 Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Tue, 25 Jan 2011 18:09:29 +0000 Subject: [PATCH] [CMAKE] - Fix mc command - temporary disable optimization settings to prevent warning svn path=/branches/cmake-bringup/; revision=50490 --- msc.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/msc.cmake b/msc.cmake index 1c4ce8654ad..a6abdf61567 100644 --- a/msc.cmake +++ b/msc.cmake @@ -1,4 +1,5 @@ +if(0) # Fixme redefinition warning if(OPTIMIZE STREQUAL "1") add_definitions(/O1) elseif(OPTIMIZE STREQUAL "2") @@ -10,6 +11,7 @@ elseif(OPTIMIZE STREQUAL "4") elseif(OPTIMIZE STREQUAL "5") add_definitions(/GF /Gy /Ob2 /Os /Ox /GS-) endif() +endif() add_definitions(/GS- /Zl /Zi) add_definitions(-Dinline=__inline -D__STDC__=1) @@ -189,7 +191,7 @@ macro(spec2def _dllname _spec_file) endmacro() macro(macro_mc FILE) - set(COMMAND_MC mc -r ${REACTOS_BINARY_DIR}/include/reactos -h ${REACTOS_BINARY_DIR}/include/reactos ${REACTOS_SOURCE_DIR}/include/reactos/mc/${FILE}.mc) + set(COMMAND_MC mc -r ${REACTOS_BINARY_DIR}/include/reactos -h ${REACTOS_BINARY_DIR}/include/reactos ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}.mc) endmacro() file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/importlibs)