Author: kalev Update of /cvs/pkgs/rpms/mingw32-filesystem/devel In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv3286 Modified Files: Toolchain-mingw32.cmake mingw32-filesystem.spec Log Message: Work around cmake's Qt detection in the toolchain file Index: Toolchain-mingw32.cmake =================================================================== RCS file: /cvs/pkgs/rpms/mingw32-filesystem/devel/Toolchain-mingw32.cmake,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- Toolchain-mingw32.cmake 9 Jun 2009 08:44:18 -0000 1.1 +++ Toolchain-mingw32.cmake 24 May 2010 09:39:19 -0000 1.2 @@ -12,3 +12,8 @@ SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NE # for libraries and headers in the target directories SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) + +# FindQt4.cmake queries qmake to get information, +# which doesn't work when crosscompiling +SET(QT_HEADERS_DIR ${CMAKE_FIND_ROOT_PATH}/include) +SET(QT_LIBRARY_DIR ${CMAKE_FIND_ROOT_PATH}/lib) Index: mingw32-filesystem.spec =================================================================== RCS file: /cvs/pkgs/rpms/mingw32-filesystem/devel/mingw32-filesystem.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -p -r1.30 -r1.31 --- mingw32-filesystem.spec 18 Sep 2009 21:34:17 -0000 1.30 +++ mingw32-filesystem.spec 24 May 2010 09:39:19 -0000 1.31 @@ -2,7 +2,7 @@ Name: mingw32-filesystem Version: 56 -Release: 1%{?dist} +Release: 2%{?dist} Summary: MinGW base filesystem and environment Group: Development/Libraries @@ -166,6 +166,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon May 24 2010 Kalev Lember <kalev(a)smartlink.ee&gt; - 56-2 +- Work around cmake's Qt detection in the toolchain file + * Fri Sep 18 2009 Erik van Pienbroek <epienbro(a)fedoraproject.org. - 56-1 - Prevented a circular dependency which caused the i686-pc-mingw32-pkg-config script to be broken. Thanks to Kalev Lember for spotting this bug