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

Fix the handling of quoted arguments in the cmake macros

Browse Source
This commit is contained in:
Erik van Pienbroek 2012-08-13 20:56:01 +02:00
parent 7b07576344
commit 328f054f6a
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
macros.mingw32
View File

@ -140,7 +140,7 @@
-DCMAKE_TOOLCHAIN_FILE=/usr/share/mingw/Toolchain-mingw32.cmake \\\ -DCMAKE_TOOLCHAIN_FILE=/usr/share/mingw/Toolchain-mingw32.cmake \\\
${MINGW_CMAKE_ARGS} \\\ ${MINGW_CMAKE_ARGS} \\\
${MINGW32_CMAKE_ARGS} \\\ ${MINGW32_CMAKE_ARGS} \\\
$@ $__mingw32_topdir "$@" $__mingw32_topdir
%mingw32_cmake_kde4 %{mingw32_env} ; \ %mingw32_cmake_kde4 %{mingw32_env} ; \
if test -f CMakeLists.txt; then __mingw32_topdir=.; \\\ if test -f CMakeLists.txt; then __mingw32_topdir=.; \\\
@ -159,7 +159,7 @@
-DCMAKE_TOOLCHAIN_FILE=/usr/share/mingw/Toolchain-mingw32.cmake \\\ -DCMAKE_TOOLCHAIN_FILE=/usr/share/mingw/Toolchain-mingw32.cmake \\\
${MINGW_CMAKE_ARGS} \\\ ${MINGW_CMAKE_ARGS} \\\
${MINGW32_CMAKE_ARGS} \\\ ${MINGW32_CMAKE_ARGS} \\\
$@ $__mingw32_topdir "$@" $__mingw32_topdir
%mingw32_qmake_qt4 %{mingw32_env} ; \ %mingw32_qmake_qt4 %{mingw32_env} ; \
/usr/bin/mingw32-qmake-qt4 /usr/bin/mingw32-qmake-qt4

4
macros.mingw64
View File

@ -140,7 +140,7 @@
-DCMAKE_TOOLCHAIN_FILE=/usr/share/mingw/Toolchain-mingw64.cmake \\\ -DCMAKE_TOOLCHAIN_FILE=/usr/share/mingw/Toolchain-mingw64.cmake \\\
${MINGW_CMAKE_ARGS} \\\ ${MINGW_CMAKE_ARGS} \\\
${MINGW64_CMAKE_ARGS} \\\ ${MINGW64_CMAKE_ARGS} \\\
$@ $__mingw64_topdir "$@" $__mingw64_topdir
%mingw64_cmake_kde4 %{mingw64_env} ; \ %mingw64_cmake_kde4 %{mingw64_env} ; \
if test -f CMakeLists.txt; then __mingw64_topdir=.; \\\ if test -f CMakeLists.txt; then __mingw64_topdir=.; \\\
@ -159,7 +159,7 @@
-DCMAKE_TOOLCHAIN_FILE=/usr/share/mingw/Toolchain-mingw64.cmake \\\ -DCMAKE_TOOLCHAIN_FILE=/usr/share/mingw/Toolchain-mingw64.cmake \\\
${MINGW_CMAKE_ARGS} \\\ ${MINGW_CMAKE_ARGS} \\\
${MINGW64_CMAKE_ARGS} \\\ ${MINGW64_CMAKE_ARGS} \\\
$@ $__mingw64_topdir "$@" $__mingw64_topdir
%mingw64_qmake_qt4 %{mingw64_env} ; \ %mingw64_qmake_qt4 %{mingw64_env} ; \
/usr/bin/mingw64-qmake-qt4 /usr/bin/mingw64-qmake-qt4

5
mingw-filesystem.spec
View File

@ -2,7 +2,7 @@
Name: mingw-filesystem Name: mingw-filesystem
Version: 95 Version: 95
Release: 13%{?dist} Release: 14%{?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,9 @@ install -m 0644 %{SOURCE12} $RPM_BUILD_ROOT%{_datadir}/mingw/
%changelog %changelog
* Mon Aug 13 2012 Erik van Pienbroek <epienbro@fedoraproject.org> - 95-14
- Fix the handling of quoted arguments in the cmake macros
* Tue Jul 24 2012 Erik van Pienbroek <epienbro@fedoraproject.org> - 95-13 * Tue Jul 24 2012 Erik van Pienbroek <epienbro@fedoraproject.org> - 95-13
- Make sure the %%mingw_cmake and %%mingw_cmake_kde4 macros respect the - Make sure the %%mingw_cmake and %%mingw_cmake_kde4 macros respect the
environment variable MINGW_BUILDDIR_SUFFIX environment variable MINGW_BUILDDIR_SUFFIX