[mingw-filesystem] Fix the handling of quoted arguments in the cmake macros
Erik van Pienbroek
epienbro at fedoraproject.org
Mon Aug 13 18:56:28 UTC 2012
commit 328f054f6ac5864fcc42e3ff742b59951163f88a
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date: Mon Aug 13 20:56:01 2012 +0200
Fix the handling of quoted arguments in the cmake macros
macros.mingw32 | 4 ++--
macros.mingw64 | 4 ++--
mingw-filesystem.spec | 5 ++++-
3 files changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/macros.mingw32 b/macros.mingw32
index fa4ace4..c754da0 100644
--- a/macros.mingw32
+++ b/macros.mingw32
@@ -140,7 +140,7 @@
-DCMAKE_TOOLCHAIN_FILE=/usr/share/mingw/Toolchain-mingw32.cmake \\\
${MINGW_CMAKE_ARGS} \\\
${MINGW32_CMAKE_ARGS} \\\
- $@ $__mingw32_topdir
+ "$@" $__mingw32_topdir
%mingw32_cmake_kde4 %{mingw32_env} ; \
if test -f CMakeLists.txt; then __mingw32_topdir=.; \\\
@@ -159,7 +159,7 @@
-DCMAKE_TOOLCHAIN_FILE=/usr/share/mingw/Toolchain-mingw32.cmake \\\
${MINGW_CMAKE_ARGS} \\\
${MINGW32_CMAKE_ARGS} \\\
- $@ $__mingw32_topdir
+ "$@" $__mingw32_topdir
%mingw32_qmake_qt4 %{mingw32_env} ; \
/usr/bin/mingw32-qmake-qt4
diff --git a/macros.mingw64 b/macros.mingw64
index ad39f3c..1ebe7e5 100644
--- a/macros.mingw64
+++ b/macros.mingw64
@@ -140,7 +140,7 @@
-DCMAKE_TOOLCHAIN_FILE=/usr/share/mingw/Toolchain-mingw64.cmake \\\
${MINGW_CMAKE_ARGS} \\\
${MINGW64_CMAKE_ARGS} \\\
- $@ $__mingw64_topdir
+ "$@" $__mingw64_topdir
%mingw64_cmake_kde4 %{mingw64_env} ; \
if test -f CMakeLists.txt; then __mingw64_topdir=.; \\\
@@ -159,7 +159,7 @@
-DCMAKE_TOOLCHAIN_FILE=/usr/share/mingw/Toolchain-mingw64.cmake \\\
${MINGW_CMAKE_ARGS} \\\
${MINGW64_CMAKE_ARGS} \\\
- $@ $__mingw64_topdir
+ "$@" $__mingw64_topdir
%mingw64_qmake_qt4 %{mingw64_env} ; \
/usr/bin/mingw64-qmake-qt4
diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index 782cca6..4aefd42 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -2,7 +2,7 @@
Name: mingw-filesystem
Version: 95
-Release: 13%{?dist}
+Release: 14%{?dist}
Summary: MinGW cross compiler base filesystem and environment
Group: Development/Libraries
@@ -246,6 +246,9 @@ install -m 0644 %{SOURCE12} $RPM_BUILD_ROOT%{_datadir}/mingw/
%changelog
+* Mon Aug 13 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 95-14
+- Fix the handling of quoted arguments in the cmake macros
+
* Tue Jul 24 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 95-13
- Make sure the %%mingw_cmake and %%mingw_cmake_kde4 macros respect the
environment variable MINGW_BUILDDIR_SUFFIX
More information about the scm-commits
mailing list