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

Added new macros for Qt5 support

Browse Source 
- Added new macros for Qt5 support, %mingw32_qmake_qt5, %mingw64_qmake_qt5,
  %mingw_qmake_qt4 and %mingw_qmake_qt5
- It isn't necessary to call %mingw32_env / %mingw64_env any more
  in the %mingw32_qmake_qt4 and %mingw64_qmake_qt4 macros
This commit is contained in:
Erik van Pienbroek 2012-09-18 00:10:08 +02:00
parent 328f054f6a
commit 4c049af9fb
4 changed files with 48 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
macros.mingw
View File

@ -97,5 +97,41 @@ popd \
} \ } \
run_mingw_cmake_kde4 run_mingw_cmake_kde4
%mingw_qmake_qt4 \
run_mingw_qmake_qt4() \
{ \
%if 0%{?mingw_build_win32} == 1 \
mkdir build_win32$MINGW_BUILDDIR_SUFFIX \
pushd build_win32$MINGW_BUILDDIR_SUFFIX \
%{?mingw32_qmake_qt4} "$@" \
popd \
%endif \
%if 0%{?mingw_build_win64} == 1 \
mkdir build_win64$MINGW_BUILDDIR_SUFFIX \
pushd build_win64$MINGW_BUILDDIR_SUFFIX \
%{?mingw64_qmake_qt4} "$@" \
popd \
%endif \
} \
run_mingw_qmake_qt4
%mingw_qmake_qt5 \
run_mingw_qmake_qt5() \
{ \
%if 0%{?mingw_build_win32} == 1 \
mkdir build_win32$MINGW_BUILDDIR_SUFFIX \
pushd build_win32$MINGW_BUILDDIR_SUFFIX \
%{?mingw32_qmake_qt5} "$@" \
popd \
%endif \
%if 0%{?mingw_build_win64} == 1 \
mkdir build_win64$MINGW_BUILDDIR_SUFFIX \
pushd build_win64$MINGW_BUILDDIR_SUFFIX \
%{?mingw64_qmake_qt5} "$@" \
popd \
%endif \
} \
run_mingw_qmake_qt5
# Deprecated: # Deprecated:
%mingw_make_install %mingw_make install %mingw_make_install %mingw_make install

4
macros.mingw32
View File

@ -161,8 +161,8 @@
${MINGW32_CMAKE_ARGS} \\\ ${MINGW32_CMAKE_ARGS} \\\
"$@" $__mingw32_topdir "$@" $__mingw32_topdir
%mingw32_qmake_qt4 %{mingw32_env} ; \ %mingw32_qmake_qt4 /usr/bin/mingw32-qmake-qt4
/usr/bin/mingw32-qmake-qt4 %mingw32_qmake_qt5 /usr/bin/mingw32-qmake-qt5
%mingw32_description This is the cross-compiled version of this library / tool.\ %mingw32_description This is the cross-compiled version of this library / tool.\
You should only install this package if you want to cross-compile programs for \ You should only install this package if you want to cross-compile programs for \

4
macros.mingw64
View File

@ -161,8 +161,8 @@
${MINGW64_CMAKE_ARGS} \\\ ${MINGW64_CMAKE_ARGS} \\\
"$@" $__mingw64_topdir "$@" $__mingw64_topdir
%mingw64_qmake_qt4 %{mingw64_env} ; \ %mingw64_qmake_qt4 /usr/bin/mingw64-qmake-qt4
/usr/bin/mingw64-qmake-qt4 %mingw64_qmake_qt5 /usr/bin/mingw64-qmake-qt5
%mingw64_description This is the cross-compiled version of this library / tool.\ %mingw64_description This is the cross-compiled version of this library / tool.\
You should only install this package if you want to cross-compile programs for \ You should only install this package if you want to cross-compile programs for \

10
mingw-filesystem.spec
View File

@ -1,8 +1,8 @@
%global debug_package %{nil} %global debug_package %{nil}
Name: mingw-filesystem Name: mingw-filesystem
Version: 95 Version: 96
Release: 14%{?dist} Release: 1%{?dist}
Summary: MinGW cross compiler base filesystem and environment Summary: MinGW cross compiler base filesystem and environment
Group: Development/Libraries Group: Development/Libraries
@ -246,6 +246,12 @@ install -m 0644 %{SOURCE12} $RPM_BUILD_ROOT%{_datadir}/mingw/
%changelog %changelog
* Mon Sep 17 2012 Erik van Pienbroek <epienbro@fedoraproject.org> - 96-1
- Added new macros for Qt5 support, %%mingw32_qmake_qt5, %%mingw64_qmake_qt5,
%%mingw_qmake_qt4 and %%mingw_qmake_qt5
- It isn't necessary to call %%mingw32_env / %%mingw64_env any more
in the %%mingw32_qmake_qt4 and %%mingw64_qmake_qt4 macros
* Mon Aug 13 2012 Erik van Pienbroek <epienbro@fedoraproject.org> - 95-14 * Mon Aug 13 2012 Erik van Pienbroek <epienbro@fedoraproject.org> - 95-14
- Fix the handling of quoted arguments in the cmake macros - Fix the handling of quoted arguments in the cmake macros