rpms/mingw-filesystem
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Work around cmake's Qt detection in the toolchain file

Browse Source
This commit is contained in:
Kalev Lember 2010-05-24 09:39:19 +00:00
parent 61e147418d
commit 144b0e9c04
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Toolchain-mingw32.cmake
View File

@ -12,3 +12,8 @@ SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
# for libraries and headers in the target directories # for libraries and headers in the target directories
SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE 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)

5
mingw32-filesystem.spec
View File

@ -2,7 +2,7 @@
Name: mingw32-filesystem Name: mingw32-filesystem
Version: 56 Version: 56
Release: 1%{?dist} Release: 2%{?dist}
Summary: MinGW base filesystem and environment Summary: MinGW base filesystem and environment
Group: Development/Libraries Group: Development/Libraries
@ -166,6 +166,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Mon May 24 2010 Kalev Lember <kalev@smartlink.ee> - 56-2
- Work around cmake's Qt detection in the toolchain file
* Fri Sep 18 2009 Erik van Pienbroek <epienbro@fedoraproject.org. - 56-1 * Fri Sep 18 2009 Erik van Pienbroek <epienbro@fedoraproject.org. - 56-1
- Prevented a circular dependency which caused the i686-pc-mingw32-pkg-config - Prevented a circular dependency which caused the i686-pc-mingw32-pkg-config
script to be broken. Thanks to Kalev Lember for spotting this bug script to be broken. Thanks to Kalev Lember for spotting this bug