[ros-diffs] [akhaldi] 56129: [CMAKE] * Temporarily work around the cmake rc handling bug when it comes to allowing warnings.
akhaldi at svn.reactos.org
akhaldi at svn.reactos.org
Mon Mar 12 12:39:55 UTC 2012
Author: akhaldi
Date: Mon Mar 12 12:39:51 2012
New Revision: 56129
URL: http://svn.reactos.org/svn/reactos?rev=56129&view=rev
Log:
[CMAKE]
* Temporarily work around the cmake rc handling bug when it comes to allowing warnings.
Modified:
trunk/reactos/base/applications/winhlp32/CMakeLists.txt
trunk/reactos/base/applications/wordpad/CMakeLists.txt
trunk/reactos/base/applications/write/CMakeLists.txt
trunk/reactos/dll/directx/ksproxy/CMakeLists.txt
trunk/reactos/dll/directx/quartz/CMakeLists.txt
trunk/reactos/dll/directx/wine/wined3d/CMakeLists.txt
trunk/reactos/dll/win32/aclui/CMakeLists.txt
trunk/reactos/dll/win32/browseui/CMakeLists.txt
trunk/reactos/dll/win32/crypt32/CMakeLists.txt
trunk/reactos/dll/win32/dbghelp/CMakeLists.txt
trunk/reactos/dll/win32/itss/CMakeLists.txt
trunk/reactos/dll/win32/jscript/CMakeLists.txt
trunk/reactos/dll/win32/localspl/CMakeLists.txt
trunk/reactos/dll/win32/rpcrt4/CMakeLists.txt
trunk/reactos/dll/win32/shdocvw/CMakeLists.txt
trunk/reactos/dll/win32/shell32/CMakeLists.txt
trunk/reactos/dll/win32/wininet/CMakeLists.txt
trunk/reactos/dll/win32/winmm/CMakeLists.txt
Modified: trunk/reactos/base/applications/winhlp32/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32/CMakeLists.txt?rev=56129&r1=56128&r2=56129&view=diff
==============================================================================
--- trunk/reactos/base/applications/winhlp32/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/CMakeLists.txt [iso-8859-1] Mon Mar 12 12:39:51 2012
@@ -1,5 +1,3 @@
-
-set_rc_compiler()
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
@@ -9,13 +7,16 @@
-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_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()
Modified: trunk/reactos/base/applications/wordpad/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/CMakeLists.txt?rev=56129&r1=56128&r2=56129&view=diff
==============================================================================
--- trunk/reactos/base/applications/wordpad/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/base/applications/wordpad/CMakeLists.txt [iso-8859-1] Mon Mar 12 12:39:51 2012
@@ -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
+ wordpad.c)
+
+add_executable(wordpad
+ ${SOURCE}
rsrc.rc)
-
-add_executable(wordpad ${SOURCE})
set_module_type(wordpad win32gui)
target_link_libraries(wordpad wine uuid)
@@ -20,5 +18,7 @@
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()
Modified: trunk/reactos/base/applications/write/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/write/CMakeLists.txt?rev=56129&r1=56128&r2=56129&view=diff
==============================================================================
--- trunk/reactos/base/applications/write/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/base/applications/write/CMakeLists.txt [iso-8859-1] Mon Mar 12 12:39:51 2012
@@ -1,5 +1,3 @@
-
-set_rc_compiler()
add_executable(write write.c rsrc.rc)
set_module_type(write win32gui UNICODE)
@@ -7,5 +5,7 @@
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()
Modified: trunk/reactos/dll/directx/ksproxy/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ksproxy/CMakeLists.txt?rev=56129&r1=56128&r2=56129&view=diff
==============================================================================
--- trunk/reactos/dll/directx/ksproxy/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/ksproxy/CMakeLists.txt [iso-8859-1] Mon Mar 12 12:39:51 2012
@@ -3,7 +3,7 @@
spec2def(ksproxy.ax ksproxy.spec)
-add_library(ksproxy SHARED
+list(APPEND SOURCE
allocator.cpp
basicaudio.cpp
classfactory.cpp
@@ -16,7 +16,6 @@
input_pin.cpp
interface.cpp
ksproxy.cpp
- ksproxy.rc
mediasample.cpp
node.cpp
output_pin.cpp
@@ -24,13 +23,19 @@
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 @@
ntdll)
add_cd_file(TARGET ksproxy DESTINATION reactos/system32 FOR all)
+
Modified: trunk/reactos/dll/directx/quartz/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/quartz/CMakeLists.txt?rev=56129&r1=56128&r2=56129&view=diff
==============================================================================
--- trunk/reactos/dll/directx/quartz/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/quartz/CMakeLists.txt [iso-8859-1] Mon Mar 12 12:39:51 2012
@@ -39,12 +39,13 @@
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_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()
Modified: trunk/reactos/dll/directx/wine/wined3d/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/CMakeLists.txt?rev=56129&r1=56128&r2=56129&view=diff
==============================================================================
--- trunk/reactos/dll/directx/wine/wined3d/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/wined3d/CMakeLists.txt [iso-8859-1] Mon Mar 12 12:39:51 2012
@@ -5,8 +5,6 @@
-DUSE_WIN32_OPENGL)
include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine)
-
-set_rc_compiler()
if(MSVC)
add_definitions(-Disnan=_isnan)
@@ -42,7 +40,6 @@
view.c
volume.c
wined3d_main.c
- version.rc
${CMAKE_CURRENT_BINARY_DIR}/wined3d.def)
if(ARCH MATCHES amd64)
@@ -51,7 +48,9 @@
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_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()
Modified: trunk/reactos/dll/win32/aclui/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/CMakeLists.txt?rev=56129&r1=56128&r2=56129&view=diff
==============================================================================
--- trunk/reactos/dll/win32/aclui/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/aclui/CMakeLists.txt [iso-8859-1] Mon Mar 12 12:39:51 2012
@@ -10,11 +10,18 @@
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)
Modified: trunk/reactos/dll/win32/browseui/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/CMakeLists.txt?rev=56129&r1=56128&r2=56129&view=diff
==============================================================================
--- trunk/reactos/dll/win32/browseui/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/browseui/CMakeLists.txt [iso-8859-1] Mon Mar 12 12:39:51 2012
@@ -40,12 +40,19 @@
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_pch(browseui precomp.h)
add_cd_file(TARGET browseui DESTINATION reactos/system32 FOR all)
+
Modified: trunk/reactos/dll/win32/crypt32/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/CMakeLists.txt?rev=56129&r1=56128&r2=56129&view=diff
==============================================================================
--- trunk/reactos/dll/win32/crypt32/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/crypt32/CMakeLists.txt [iso-8859-1] Mon Mar 12 12:39:51 2012
@@ -37,12 +37,19 @@
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)
Modified: trunk/reactos/dll/win32/dbghelp/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/CMakeLists.txt?rev=56129&r1=56128&r2=56129&view=diff
==============================================================================
--- trunk/reactos/dll/win32/dbghelp/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/dbghelp/CMakeLists.txt [iso-8859-1] Mon Mar 12 12:39:51 2012
@@ -40,16 +40,24 @@
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)
Modified: trunk/reactos/dll/win32/itss/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/itss/CMakeLists.txt?rev=56129&r1=56128&r2=56129&view=diff
==============================================================================
--- trunk/reactos/dll/win32/itss/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/itss/CMakeLists.txt [iso-8859-1] Mon Mar 12 12:39:51 2012
@@ -13,19 +13,22 @@
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
Modified: trunk/reactos/dll/win32/jscript/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/CMakeLists.txt?rev=56129&r1=56128&r2=56129&view=diff
==============================================================================
--- trunk/reactos/dll/win32/jscript/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/jscript/CMakeLists.txt [iso-8859-1] Mon Mar 12 12:39:51 2012
@@ -36,10 +36,11 @@
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_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)
Modified: trunk/reactos/dll/win32/localspl/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/CMakeLists.txt?rev=56129&r1=56128&r2=56129&view=diff
==============================================================================
--- trunk/reactos/dll/win32/localspl/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/localspl/CMakeLists.txt [iso-8859-1] Mon Mar 12 12:39:51 2012
@@ -14,11 +14,12 @@
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_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()
+
Modified: trunk/reactos/dll/win32/rpcrt4/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/CMakeLists.txt?rev=56129&r1=56128&r2=56129&view=diff
==============================================================================
--- trunk/reactos/dll/win32/rpcrt4/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/rpcrt4/CMakeLists.txt [iso-8859-1] Mon Mar 12 12:39:51 2012
@@ -19,7 +19,6 @@
rpc_binding.c
rpc_epmap.c
rpc_message.c
- rpcrt4.rc
rpcrt4_main.c
rpc_server.c
rpc_transport.c
@@ -42,7 +41,10 @@
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 @@
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()
Modified: trunk/reactos/dll/win32/shdocvw/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/CMakeLists.txt?rev=56129&r1=56128&r2=56129&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shdocvw/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shdocvw/CMakeLists.txt [iso-8859-1] Mon Mar 12 12:39:51 2012
@@ -3,8 +3,6 @@
add_definitions(-D_SHDOCVW_)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
-
-set_rc_compiler()
spec2def(shdocvw.dll shdocvw.spec ADD_IMPORTLIB)
@@ -27,13 +25,15 @@
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_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()
Modified: trunk/reactos/dll/win32/shell32/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CMakeLists.txt?rev=56129&r1=56128&r2=56129&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/CMakeLists.txt [iso-8859-1] Mon Mar 12 12:39:51 2012
@@ -71,12 +71,19 @@
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 @@
ntdll)
add_dependencies(shdocvw shdocvw_v1)
-
add_pch(shell32 precomp.h)
-
add_cd_file(TARGET shell32 DESTINATION reactos/system32 FOR all)
-
Modified: trunk/reactos/dll/win32/wininet/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/CMakeLists.txt?rev=56129&r1=56128&r2=56129&view=diff
==============================================================================
--- trunk/reactos/dll/win32/wininet/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wininet/CMakeLists.txt [iso-8859-1] Mon Mar 12 12:39:51 2012
@@ -8,8 +8,6 @@
include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/zlib)
spec2def(wininet.dll wininet.spec ADD_IMPORTLIB)
-
-set_rc_compiler()
list(APPEND SOURCE
cookie.c
@@ -22,12 +20,13 @@
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_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()
Modified: trunk/reactos/dll/win32/winmm/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/CMakeLists.txt?rev=56129&r1=56128&r2=56129&view=diff
==============================================================================
--- trunk/reactos/dll/win32/winmm/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/winmm/CMakeLists.txt [iso-8859-1] Mon Mar 12 12:39:51 2012
@@ -3,8 +3,6 @@
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
spec2def(winmm.dll winmm.spec ADD_IMPORTLIB)
-
-set_rc_compiler()
list(APPEND SOURCE
driver.c
@@ -16,17 +14,21 @@
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)
-
More information about the Ros-diffs
mailing list