[ros-diffs] [akhaldi] 56120: [CMAKE] * Temporarily work around the cmake rc handling bug.

akhaldi at svn.reactos.org akhaldi at svn.reactos.org
Sun Mar 11 19:01:39 UTC 2012


Author: akhaldi
Date: Sun Mar 11 19:01:39 2012
New Revision: 56120

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

Modified:
    trunk/reactos/drivers/video/displays/framebuf_new/CMakeLists.txt

Modified: trunk/reactos/drivers/video/displays/framebuf_new/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/framebuf_new/CMakeLists.txt?rev=56120&r1=56119&r2=56120&view=diff
==============================================================================
--- trunk/reactos/drivers/video/displays/framebuf_new/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/drivers/video/displays/framebuf_new/CMakeLists.txt [iso-8859-1] Sun Mar 11 19:01:39 2012
@@ -7,16 +7,20 @@
     palette.c
     pointer.c
     screen.c
-    framebuf_new.rc
     ${CMAKE_CURRENT_BINARY_DIR}/framebuf_new.def)
 
-add_library(framebuf_new SHARED ${SOURCE})
+add_library(framebuf_new SHARED
+    ${SOURCE}
+    framebuf_new.rc)
 
 if(ARCH MATCHES i386)
+    # FIXME: http://www.cmake.org/Bug/view.php?id=12998
     if(MSVC)
-        add_target_compile_flags(framebuf_new "/Gz")
+        #add_target_compile_flags(framebuf_new "/Gz")
+        set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "/Gz")
     else()
-        add_target_compile_flags(framebuf_new "-mrtd -fno-builtin")
+        #add_target_compile_flags(framebuf_new "-mrtd -fno-builtin")
+        set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-mrtd -fno-builtin")
     endif()
 endif()
 




More information about the Ros-diffs mailing list