From dd7c74f479edbe603445510ecf767b94722d2424 Mon Sep 17 00:00:00 2001 From: Erik van Pienbroek Date: Nov 11 2010 22:39:31 +0000 Subject: Set the CMAKE_RC_COMPILER variable in the CMake toolchain file (RHBZ #652435) --- diff --git a/Toolchain-mingw32.cmake b/Toolchain-mingw32.cmake index 8345ecf..d80988d 100644 --- a/Toolchain-mingw32.cmake +++ b/Toolchain-mingw32.cmake @@ -17,3 +17,7 @@ SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) # which doesn't work when crosscompiling SET(QT_HEADERS_DIR ${CMAKE_FIND_ROOT_PATH}/include) 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) + diff --git a/mingw32-filesystem.spec b/mingw32-filesystem.spec index c21fcc2..61889bd 100644 --- a/mingw32-filesystem.spec +++ b/mingw32-filesystem.spec @@ -1,8 +1,8 @@ %define debug_package %{nil} Name: mingw32-filesystem -Version: 62 -Release: 2%{?dist} +Version: 63 +Release: 1%{?dist} Summary: MinGW base filesystem and environment Group: Development/Libraries @@ -167,6 +167,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Nov 11 2010 Erik van Pienbroek - 63-1 +- Set the CMAKE_RC_COMPILER variable in the CMake toolchain file (RHBZ #652435) + * Tue Oct 19 2010 Ivan Romanov - 62-2 - Added mingw32-qmake-qt4