Author: tkreuzer
Date: Tue Jan 25 18:09:29 2011
New Revision: 50490
URL:
http://svn.reactos.org/svn/reactos?rev=50490&view=rev
Log:
[CMAKE]
- Fix mc command
- temporary disable optimization settings to prevent warning
Modified:
branches/cmake-bringup/msc.cmake
Modified: branches/cmake-bringup/msc.cmake
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/msc.cmake?rev=504…
==============================================================================
--- branches/cmake-bringup/msc.cmake [iso-8859-1] (original)
+++ branches/cmake-bringup/msc.cmake [iso-8859-1] Tue Jan 25 18:09:29 2011
@@ -1,4 +1,5 @@
+if(0) # Fixme redefinition warning
if(OPTIMIZE STREQUAL "1")
add_definitions(/O1)
elseif(OPTIMIZE STREQUAL "2")
@@ -9,6 +10,7 @@
add_definitions(/Os /Ox /GS-)
elseif(OPTIMIZE STREQUAL "5")
add_definitions(/GF /Gy /Ob2 /Os /Ox /GS-)
+endif()
endif()
add_definitions(/GS- /Zl /Zi)
@@ -189,7 +191,7 @@
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)