[ros-diffs] [akhaldi] 56106: [CMAKE] * Temporarily work around the cmake rc handling bug (mentioned previously).

[akhaldi at svn.reactos.org]

Author: akhaldi
Date: Sat Mar 10 19:40:40 2012
New Revision: 56106

URL: http://svn.reactos.org/svn/reactos?rev=56106&view=rev
Log:
[CMAKE]
* Temporarily work around the cmake rc handling bug (mentioned previously).

Modified:
    trunk/reactos/dll/win32/imm32/CMakeLists.txt
    trunk/reactos/drivers/video/miniport/vga_new/CMakeLists.txt

Modified: trunk/reactos/dll/win32/imm32/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imm32/CMakeLists.txt?rev=56106&r1=56105&r2=56106&view=diff
==============================================================================
--- trunk/reactos/dll/win32/imm32/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/imm32/CMakeLists.txt [iso-8859-1] Sat Mar 10 19:40:40 2012
@@ -10,14 +10,17 @@
 
 list(APPEND SOURCE
     imm.c
-    version.rc
     ${CMAKE_CURRENT_BINARY_DIR}/imm32_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/imm32.def)
 
-add_library(imm32 SHARED ${SOURCE})
+add_library(imm32 SHARED
+    ${SOURCE}
+    version.rc)
 
 if(MSVC)
-    add_target_compile_flags(imm32 "/FIwine/typeof.h")
+    # FIXME: http://www.cmake.org/Bug/view.php?id=12998
+    #add_target_compile_flags(imm32 "/FIwine/typeof.h")
+    set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "/FIwine/typeof.h")
 endif()
 
 set_module_type(imm32 win32dll)

Modified: trunk/reactos/drivers/video/miniport/vga_new/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/miniport/vga_new/CMakeLists.txt?rev=56106&r1=56105&r2=56106&view=diff
==============================================================================
--- trunk/reactos/drivers/video/miniport/vga_new/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/drivers/video/miniport/vga_new/CMakeLists.txt [iso-8859-1] Sat Mar 10 19:40:40 2012
@@ -12,10 +12,11 @@
 
 target_link_libraries(vga libcntpr)
 
+# FIXME: http://www.cmake.org/Bug/view.php?id=12998
 if(MSVC)
-    add_target_compile_flags(vga "/Gz")
+    #add_target_compile_flags(vga "/Gz")
+    set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "/Gz")
 else()
-    # FIXME: http://www.cmake.org/Bug/view.php?id=12998
     #add_target_compile_flags(vga "-mrtd -fno-builtin")
     set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-mrtd -fno-builtin")
 endif()