* Temporarily work around the cmake rc handling bug (mentioned previously).

svn path=/trunk/; revision=56106
This commit is contained in:
Amine Khaldi 2012-03-10 19:40:40 +00:00
parent 03e43b5850
commit 9c0969d45c
2 changed files with 9 additions and 5 deletions

View file

@ -10,14 +10,17 @@ spec2def(imm32.dll imm32.spec ADD_IMPORTLIB)
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)

View file

@ -12,10 +12,11 @@ add_library(vga SHARED
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()