[mingw32-filesystem/f15] windres options for cmake (RHBZ #652435)

ivanromanov ivanromanov at fedoraproject.org
Sun Mar 25 18:37:08 UTC 2012


commit 29a8d946dbc2bf6502731ecaeeaa3b26a14452b4
Author: Ivan Romanov <drizt at land.ru>
Date:   Mon Mar 26 00:36:41 2012 +0600

    windres options for cmake (RHBZ #652435)

 Toolchain-mingw32.cmake |    2 ++
 mingw32-filesystem.spec |    5 ++++-
 2 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/Toolchain-mingw32.cmake b/Toolchain-mingw32.cmake
index 6c9c932..c000ca8 100644
--- a/Toolchain-mingw32.cmake
+++ b/Toolchain-mingw32.cmake
@@ -20,6 +20,8 @@ SET(QT_LIBRARY_DIR ${CMAKE_FIND_ROOT_PATH}/lib)
 
 # set the resource compiler (RHBZ #652435)
 SET(CMAKE_RC_COMPILER /usr/bin/i686-pc-mingw32-windres)
+SET(CMAKE_RC_COMPILE_OBJECT
+  "<CMAKE_RC_COMPILER> <FLAGS> <DEFINES> -O coff -o <OBJECT> <SOURCE>")
 
 # override boost library suffix which defaults to -mgw
 SET(Boost_COMPILER -gcc45)
diff --git a/mingw32-filesystem.spec b/mingw32-filesystem.spec
index 2dad86f..31517aa 100644
--- a/mingw32-filesystem.spec
+++ b/mingw32-filesystem.spec
@@ -2,7 +2,7 @@
 
 Name:           mingw32-filesystem
 Version:        69
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        MinGW base filesystem and environment
 
 Group:          Development/Libraries
@@ -191,6 +191,9 @@ install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/mingw32
 
 
 %changelog
+* Mon Mar 26 2012 Ivan Romanov <drizt at land.ru> - 69.5
+- windres options for cmake (RHBZ #652435)
+
 * Sat Nov 12 2011 Erik van Pienbroek <epienbro at fedoraproject.org> - 69-4
 - Backported the changes from f16/master up to 69-8 excluding 69-3
   This contains a more complete list of Win32 default DLLs and


More information about the mingw mailing list