[CMAKE]

* Temporarily work around the cmake rc handling bug when it comes to allowing warnings. svn path=/trunk/; revision=56129
2024-09-28 05:26:58 +00:00 · 2012-03-12 12:39:51 +00:00 · 2012-03-12 12:39:51 +00:00 · d67a1457b9
parent 1e180c788f
commit d67a1457b9
18 changed files with 141 additions and 78 deletions
--- a/reactos/base/applications/winhlp32/CMakeLists.txt
+++ b/reactos/base/applications/winhlp32/CMakeLists.txt
@ -1,6 +1,4 @@

-set_rc_compiler()
-
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)

 add_definitions(
@ -9,13 +7,16 @@ add_definitions(
    -Dfileno=_fileno
    -Disatty=_isatty)

-add_executable(winhlp32
+list(APPEND SOURCE
    callback.c
    hlpfile.c
    macro.c
    string.c
    winhelp.c
-    lex.yy.c
+    lex.yy.c)
+
+add_executable(winhlp32
+    ${SOURCE}
    rsrc.rc)

 set_module_type(winhlp32 win32gui)
@ -24,5 +25,7 @@ add_importlibs(winhlp32 user32 gdi32 shell32 comctl32 comdlg32 msvcrt kernel32 n
 add_cd_file(TARGET winhlp32 DESTINATION reactos FOR all)

 if(NOT MSVC)
-    allow_warnings(winhlp32)
+    # FIXME: http://www.cmake.org/Bug/view.php?id=12998
+    #allow_warnings(winhlp32)
+    set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error")
 endif()
--- a/reactos/base/applications/wordpad/CMakeLists.txt
+++ b/reactos/base/applications/wordpad/CMakeLists.txt
@ -1,18 +1,16 @@

 include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine)
-
 add_definitions(-D__ROS_LONG64__)

-set_rc_compiler()
-
 list(APPEND SOURCE
    olecallback.c
    print.c
    registry.c
-    wordpad.c
-    rsrc.rc)
+    wordpad.c)

-add_executable(wordpad ${SOURCE})
+add_executable(wordpad
+    ${SOURCE}
+    rsrc.rc)

 set_module_type(wordpad win32gui)
 target_link_libraries(wordpad wine uuid)
@ -20,5 +18,7 @@ add_importlibs(wordpad comdlg32 ole32 shell32 user32 gdi32 advapi32 comctl32 msv
 add_cd_file(TARGET wordpad DESTINATION reactos/system32 FOR all)

 if(NOT MSVC)
-    allow_warnings(wordpad)
+    # FIXME: http://www.cmake.org/Bug/view.php?id=12998
+    #allow_warnings(wordpad)
+    set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error")
 endif()
--- a/reactos/base/applications/write/CMakeLists.txt
+++ b/reactos/base/applications/write/CMakeLists.txt
@ -1,11 +1,11 @@

-set_rc_compiler()
-
 add_executable(write write.c rsrc.rc)
 set_module_type(write win32gui UNICODE)
 add_importlibs(write user32 gdi32 msvcrt kernel32)
 add_cd_file(TARGET write DESTINATION reactos/system32 FOR all)

 if(NOT MSVC)
-    allow_warnings(write)
+    # FIXME: http://www.cmake.org/Bug/view.php?id=12998
+    #allow_warnings(write)
+    set_source_files_properties(write.c PROPERTIES COMPILE_FLAGS "-Wno-error")
 endif()
--- a/reactos/dll/directx/ksproxy/CMakeLists.txt
+++ b/reactos/dll/directx/ksproxy/CMakeLists.txt
@ -3,7 +3,7 @@ set_cpp()

 spec2def(ksproxy.ax ksproxy.spec)

-add_library(ksproxy SHARED
+list(APPEND SOURCE
    allocator.cpp
    basicaudio.cpp
    classfactory.cpp
@ -16,7 +16,6 @@ add_library(ksproxy SHARED
    input_pin.cpp
    interface.cpp
    ksproxy.cpp
-    ksproxy.rc
    mediasample.cpp
    node.cpp
    output_pin.cpp
@ -24,13 +23,19 @@ add_library(ksproxy SHARED
    qualityforward.cpp
    ${CMAKE_CURRENT_BINARY_DIR}/ksproxy.def)

+add_library(ksproxy SHARED
+    ${SOURCE}
+    ksproxy.rc)
+
 set_module_type(ksproxy win32dll ENTRYPOINT 0)
 set_target_properties(ksproxy PROPERTIES SUFFIX ".ax")

 if(MSVC)
    add_target_compile_flags(ksproxy "/GR-")
 else()
-    add_target_compile_flags(ksproxy "-fno-exceptions -fno-rtti")
+    # FIXME: http://www.cmake.org/Bug/view.php?id=12998
+    #add_target_compile_flags(ksproxy "-fno-exceptions -fno-rtti")
+    set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-fno-exceptions -fno-rtti")
 endif()

 target_link_libraries(ksproxy strmiids)
@ -45,3 +50,4 @@ add_importlibs(ksproxy
    ntdll)

 add_cd_file(TARGET ksproxy DESTINATION reactos/system32 FOR all)
+
--- a/reactos/dll/directx/quartz/CMakeLists.txt
+++ b/reactos/dll/directx/quartz/CMakeLists.txt
@ -39,12 +39,13 @@ list(APPEND SOURCE
    enummedia.c
    control.c
    avisplit.c
-    version.rc
    ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c
    ${CMAKE_CURRENT_BINARY_DIR}/quartz_strmif_p.c
    ${CMAKE_CURRENT_BINARY_DIR}/quartz.def)

-add_library(quartz SHARED ${SOURCE})
+add_library(quartz SHARED
+    ${SOURCE}
+    version.rc)

 set_module_type(quartz win32dll)

@ -74,5 +75,7 @@ add_pch(quartz quartz_private.h)
 add_cd_file(TARGET quartz DESTINATION reactos/system32 FOR all)

 if(NOT MSVC)
-    allow_warnings(quartz)
+    # FIXME: http://www.cmake.org/Bug/view.php?id=12998
+    #allow_warnings(quartz)
+    set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error")
 endif()
--- a/reactos/dll/directx/wine/wined3d/CMakeLists.txt
+++ b/reactos/dll/directx/wine/wined3d/CMakeLists.txt
@ -6,8 +6,6 @@ add_definitions(

 include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine)

-set_rc_compiler()
-
 if(MSVC)
    add_definitions(-Disnan=_isnan)
    add_definitions(-Disinf=!_finite)
@ -42,7 +40,6 @@ list(APPEND SOURCE
    view.c
    volume.c
    wined3d_main.c
-    version.rc
    ${CMAKE_CURRENT_BINARY_DIR}/wined3d.def)

 if(ARCH MATCHES amd64)
@ -51,7 +48,9 @@ list(APPEND SOURCE
     sqrtf.c)
 endif()

-add_library(wined3d SHARED ${SOURCE})
+add_library(wined3d SHARED
+    ${SOURCE}
+    version.rc)
 set_module_type(wined3d win32dll ENTRYPOINT 0)

 target_link_libraries(wined3d wine)
@ -69,7 +68,8 @@ add_dependencies(wined3d wineheaders)
 add_pch(wined3d wined3d_private.h)
 add_cd_file(TARGET wined3d DESTINATION reactos/system32 FOR all)

-
 if(NOT MSVC)
-    allow_warnings(wined3d)
+    # FIXME: http://www.cmake.org/Bug/view.php?id=12998
+    #allow_warnings(wined3d)
+    set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error")
 endif()
--- a/reactos/dll/win32/aclui/CMakeLists.txt
+++ b/reactos/dll/win32/aclui/CMakeLists.txt
@ -10,11 +10,18 @@ list(APPEND SOURCE
    guid.c
    misc.c
    sidcache.c
-    aclui.rc
    ${CMAKE_CURRENT_BINARY_DIR}/aclui.def)

-add_library(aclui SHARED ${SOURCE})
-allow_warnings(aclui)
+add_library(aclui SHARED
+    ${SOURCE}
+    aclui.rc)
+
+if(NOT MSVC)
+    # FIXME: http://www.cmake.org/Bug/view.php?id=12998
+    #allow_warnings(aclui)
+    set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error")
+endif()
+
 set_module_type(aclui win32dll UNICODE)

 add_importlibs(aclui user32 gdi32 comctl32 ole32 oleaut32 advapi32 uxtheme msvcrt kernel32 ntdll)
--- a/reactos/dll/win32/browseui/CMakeLists.txt
+++ b/reactos/dll/win32/browseui/CMakeLists.txt
@ -40,12 +40,19 @@ list(APPEND SOURCE
    toolsband.cpp
    travellog.cpp
    utility.cpp
-    browseui.rc
    dllinstall.c
    ${CMAKE_CURRENT_BINARY_DIR}/browseui.def)

-add_library(browseui SHARED ${SOURCE})
-allow_warnings(browseui)
+add_library(browseui SHARED
+    ${SOURCE}
+    browseui.rc)
+
+if(NOT MSVC)
+    # FIXME: http://www.cmake.org/Bug/view.php?id=12998
+    #allow_warnings(browseui)
+    set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error")
+endif()
+
 set_module_type(browseui win32dll UNICODE)

 target_link_libraries(browseui
@ -68,3 +75,4 @@ add_importlibs(browseui

 add_pch(browseui precomp.h)
 add_cd_file(TARGET browseui DESTINATION reactos/system32 FOR all)
+
--- a/reactos/dll/win32/crypt32/CMakeLists.txt
+++ b/reactos/dll/win32/crypt32/CMakeLists.txt
@ -37,12 +37,19 @@ list(APPEND SOURCE
    sip.c
    store.c
    str.c
-    crypt32.rc
    ${CMAKE_CURRENT_BINARY_DIR}/crypt32_stubs.c
    ${CMAKE_CURRENT_BINARY_DIR}/crypt32.def)

-add_library(crypt32 SHARED ${SOURCE})
-allow_warnings(crypt32)
+add_library(crypt32 SHARED
+    ${SOURCE}
+    crypt32.rc)
+
+if(NOT MSVC)
+    # FIXME: http://www.cmake.org/Bug/view.php?id=12998
+    #allow_warnings(crypt32)
+    set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error")
+endif()
+
 set_module_type(crypt32 win32dll)
 target_link_libraries(crypt32 wine ${PSEH_LIB} oldnames)
 add_importlibs(crypt32 user32 advapi32 msvcrt kernel32 ntdll)
--- a/reactos/dll/win32/dbghelp/CMakeLists.txt
+++ b/reactos/dll/win32/dbghelp/CMakeLists.txt
@ -40,16 +40,24 @@ list(APPEND SOURCE
    storage.c
    symbol.c
    type.c
-    version.rc
    ${CMAKE_CURRENT_BINARY_DIR}/dbghelp_stubs.c
    ${CMAKE_CURRENT_BINARY_DIR}/dbghelp.def)

-add_library(dbghelp SHARED ${SOURCE})
-allow_warnings(dbghelp)
+add_library(dbghelp SHARED
+    ${SOURCE}
+    version.rc)
+
+if(NOT MSVC)
+    # FIXME: http://www.cmake.org/Bug/view.php?id=12998
+    #allow_warnings(dbghelp)
+    set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error")
+endif()
+
 set_module_type(dbghelp win32dll)
 target_link_libraries(dbghelp wine ${PSEH_LIB} oldnames)
 add_delay_importlibs(dbghelp version)
 add_importlibs(dbghelp psapi msvcrt kernel32 ntdll)
 add_pch(dbghelp dbghelp_private.h)

+
 add_cd_file(TARGET dbghelp DESTINATION reactos/system32 FOR all)
--- a/reactos/dll/win32/itss/CMakeLists.txt
+++ b/reactos/dll/win32/itss/CMakeLists.txt
@ -13,19 +13,22 @@ list(APPEND SOURCE
    moniker.c
    protocol.c
    storage.c
-    rsrc.rc
    #${REACTOS_BINARY_DIR}/include/reactos/wine/itss_i.c
    ${CMAKE_CURRENT_BINARY_DIR}/itss_stubs.c
    ${CMAKE_CURRENT_BINARY_DIR}/itss.def)

-add_library(itss SHARED ${SOURCE})
+add_library(itss SHARED
+    ${SOURCE}
+    rsrc.rc)

 set_module_type(itss win32dll)
 target_link_libraries(itss uuid wine)
 if(MSVC)
    target_link_libraries(itss itss_guid)
 else()
-    allow_warnings(itss)
+    # FIXME: http://www.cmake.org/Bug/view.php?id=12998
+    #allow_warnings(itss)
+    set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error")
 endif()

 add_importlibs(itss
--- a/reactos/dll/win32/jscript/CMakeLists.txt
+++ b/reactos/dll/win32/jscript/CMakeLists.txt
@ -36,10 +36,11 @@ list(APPEND SOURCE
    bool.c
    function.c
    global.c
-    rsrc.rc
    ${CMAKE_CURRENT_BINARY_DIR}/jscript.def)

-add_library(jscript SHARED ${SOURCE})
+add_library(jscript SHARED
+    ${SOURCE}
+    rsrc.rc)

 set_module_type(jscript win32dll)

@ -63,7 +64,9 @@ add_dependencies(jscript stdole2)
 add_cd_file(TARGET jscript DESTINATION reactos/system32 FOR all)

 if(NOT MSVC)
-    allow_warnings(jscript)
+    # FIXME: http://www.cmake.org/Bug/view.php?id=12998
+    #allow_warnings(jscript)
+    set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error")
 endif()

 set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/jsglobal.tlb)
--- a/reactos/dll/win32/localspl/CMakeLists.txt
+++ b/reactos/dll/win32/localspl/CMakeLists.txt
@ -14,11 +14,12 @@ list(APPEND SOURCE
    localmon.c
    localspl_main.c
    provider.c
-    localspl.rc
    ${CMAKE_CURRENT_BINARY_DIR}/localspl_stubs.c
    ${CMAKE_CURRENT_BINARY_DIR}/localspl.def)

-add_library(localspl SHARED ${SOURCE})
+add_library(localspl SHARED
+    ${SOURCE}
+    localspl.rc)

 set_module_type(localspl win32dll)

@ -35,5 +36,8 @@ add_importlibs(localspl
 add_cd_file(TARGET localspl DESTINATION reactos/system32 FOR all)

 if(NOT MSVC)
-    allow_warnings(localspl)
+    # FIXME: http://www.cmake.org/Bug/view.php?id=12998
+    #allow_warnings(localspl)
+    set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error")
 endif()
+
--- a/reactos/dll/win32/rpcrt4/CMakeLists.txt
+++ b/reactos/dll/win32/rpcrt4/CMakeLists.txt
@ -19,7 +19,6 @@ list(APPEND SOURCE
    rpc_binding.c
    rpc_epmap.c
    rpc_message.c
-    rpcrt4.rc
    rpcrt4_main.c
    rpc_server.c
    rpc_transport.c
@ -42,7 +41,10 @@ add_definitions(

 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)

-add_library(rpcrt4 SHARED ${SOURCE})
+add_library(rpcrt4 SHARED
+    ${SOURCE}
+    rpcrt4.rc)
+
 set_module_type(rpcrt4 win32dll)
 target_link_libraries(rpcrt4 wine uuid ${PSEH_LIB})

@ -52,5 +54,7 @@ add_cd_file(TARGET rpcrt4 DESTINATION reactos/system32 FOR all)


 if(NOT MSVC)
-    allow_warnings(rpcrt4)
+    # FIXME: http://www.cmake.org/Bug/view.php?id=12998
+    #allow_warnings(rpcrt4)
+    set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error")
 endif()
--- a/reactos/dll/win32/shdocvw/CMakeLists.txt
+++ b/reactos/dll/win32/shdocvw/CMakeLists.txt
@ -4,8 +4,6 @@ add_typelib(shdocvw_v1.idl)
 add_definitions(-D_SHDOCVW_)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)

-set_rc_compiler()
-
 spec2def(shdocvw.dll shdocvw.spec ADD_IMPORTLIB)

 list(APPEND SOURCE
@ -27,13 +25,15 @@ list(APPEND SOURCE
    urlhist.c
    view.c
    webbrowser.c
-    shdocvw.rc
    ${CMAKE_CURRENT_BINARY_DIR}/shdocvw_stubs.c
    ${CMAKE_CURRENT_BINARY_DIR}/shdocvw.def)

 set_source_files_properties(shdocvw.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/shdocvw_v1.tlb)

-add_library(shdocvw SHARED ${SOURCE})
+add_library(shdocvw SHARED
+    ${SOURCE}
+    shdocvw.rc)
+
 set_module_type(shdocvw win32dll)
 target_link_libraries(shdocvw uuid wine)
 add_delay_importlibs(shdocvw version ole32 oleaut32)
@ -56,7 +56,8 @@ add_dependencies(shdocvw stdole2)
 add_pch(shdocvw shdocvw.h)
 add_cd_file(TARGET shdocvw DESTINATION reactos/system32 FOR all)

-
 if(NOT MSVC)
-    allow_warnings(shdocvw)
+    # FIXME: http://www.cmake.org/Bug/view.php?id=12998
+    #allow_warnings(shdocvw)
+    set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error")
 endif()
--- a/reactos/dll/win32/shell32/CMakeLists.txt
+++ b/reactos/dll/win32/shell32/CMakeLists.txt
@ -71,12 +71,19 @@ list(APPEND SOURCE
    folder_options.cpp
    filedefext.cpp
    drvdefext.cpp
-    shell32.rc
    ${CMAKE_CURRENT_BINARY_DIR}/shell32_stubs.c
    ${CMAKE_CURRENT_BINARY_DIR}/shell32.def)

-add_library(shell32 SHARED ${SOURCE})
-allow_warnings(shell32)
+add_library(shell32 SHARED
+    ${SOURCE}
+    shell32.rc)
+
+if(NOT MSVC)
+    # FIXME: http://www.cmake.org/Bug/view.php?id=12998
+    #allow_warnings(shell32)
+    set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error")
+endif()
+
 set_module_type(shell32 win32dll UNICODE)

 target_link_libraries(shell32
@ -103,8 +110,5 @@ add_importlibs(shell32
    ntdll)

 add_dependencies(shdocvw shdocvw_v1)
-
 add_pch(shell32 precomp.h)
-
 add_cd_file(TARGET shell32 DESTINATION reactos/system32 FOR all)
-
--- a/reactos/dll/win32/wininet/CMakeLists.txt
+++ b/reactos/dll/win32/wininet/CMakeLists.txt
@ -9,8 +9,6 @@ include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/zlib)

 spec2def(wininet.dll wininet.spec ADD_IMPORTLIB)

-set_rc_compiler()
-
 list(APPEND SOURCE
    cookie.c
    dialogs.c
@ -22,12 +20,13 @@ list(APPEND SOURCE
    urlcache.c
    utility.c
    wininet_main.c
-    rsrc.rc
-    version.rc
    ${CMAKE_CURRENT_BINARY_DIR}/wininet_stubs.c
    ${CMAKE_CURRENT_BINARY_DIR}/wininet.def)

-add_library(wininet SHARED ${SOURCE})
+add_library(wininet SHARED
+    ${SOURCE}
+    rsrc.rc
+    version.rc)

 set_module_type(wininet win32dll)
 target_link_libraries(wininet wine ${PSEH_LIB} zlib)
@ -35,7 +34,8 @@ add_delay_importlibs(wininet secur32 crypt32)
 add_importlibs(wininet mpr shlwapi shell32 user32 advapi32 ws2_32 msvcrt kernel32 ntdll)
 add_cd_file(TARGET wininet DESTINATION reactos/system32 FOR all)

-
 if(NOT MSVC)
-    allow_warnings(wininet)
+    # FIXME: http://www.cmake.org/Bug/view.php?id=12998
+    #allow_warnings(wininet)
+    set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error")
 endif()
--- a/reactos/dll/win32/winmm/CMakeLists.txt
+++ b/reactos/dll/win32/winmm/CMakeLists.txt
@ -4,8 +4,6 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)

 spec2def(winmm.dll winmm.spec ADD_IMPORTLIB)

-set_rc_compiler()
-
 list(APPEND SOURCE
    driver.c
    joystick.c
@ -16,17 +14,21 @@ list(APPEND SOURCE
    registry.c
    time.c
    winmm.c
-    winmm_res.rc
    ${CMAKE_CURRENT_BINARY_DIR}/winmm_stubs.c
    ${CMAKE_CURRENT_BINARY_DIR}/winmm.def)

-add_library(winmm SHARED ${SOURCE})
-allow_warnings(winmm)
+add_library(winmm SHARED
+    ${SOURCE}
+    winmm_res.rc)
+
+if(NOT MSVC)
+    # FIXME: http://www.cmake.org/Bug/view.php?id=12998
+    #allow_warnings(winmm)
+    set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error")
+endif()
+
 set_module_type(winmm win32dll)
 target_link_libraries(winmm wine ${PSEH_LIB})
-
 add_importlibs(winmm advapi32 user32 msvcrt kernel32 ntdll)
-
 add_subdirectory(midimap)
 add_cd_file(TARGET winmm DESTINATION reactos/system32 FOR all)
-