diff --git a/macros.mingw32 b/macros.mingw32 index 5a55519..644085f 100644 --- a/macros.mingw32 +++ b/macros.mingw32 @@ -125,9 +125,11 @@ if test -f CMakeLists.txt; then __mingw32_topdir=.; \\\ elif test -f ../CMakeLists.txt; then __mingw32_topdir=..; \\\ else __mingw32_topdir=""; fi; \\\ + if test "${MINGW_CMAKE_NO_VERBOSE}" == "" ; then \ + MINGW32_CMAKE_ARGS="${MINGW32_CMAKE_ARGS} -DCMAKE_VERBOSE_MAKEFILE=ON" \ + fi \ PATH=%{_prefix}/%{mingw32_target}/bin:$PATH %__cmake \\\ -DCMAKE_TOOLCHAIN_FILE=/usr/share/mingw/toolchain-mingw32.cmake \\\ - -DCMAKE_VERBOSE_MAKEFILE=ON \\\ -DBUILD_SHARED_LIBS:BOOL=ON \\\ -DLIB_INSTALL_DIR:PATH=%{mingw32_libdir} \\\ -DSYSCONF_INSTALL_DIR:PATH=%{mingw32_sysconfdir} \\\ diff --git a/macros.mingw64 b/macros.mingw64 index 106bfe0..c1d7893 100644 --- a/macros.mingw64 +++ b/macros.mingw64 @@ -125,9 +125,11 @@ if test -f CMakeLists.txt; then __mingw64_topdir=.; \\\ elif test -f ../CMakeLists.txt; then __mingw64_topdir=..; \\\ else __mingw64_topdir=""; fi; \\\ + if test "${MINGW_CMAKE_NO_VERBOSE}" == "" ; then \ + MINGW64_CMAKE_ARGS="${MINGW64_CMAKE_ARGS} -DCMAKE_VERBOSE_MAKEFILE=ON" \ + fi \ PATH=%{_prefix}/%{mingw64_target}/bin:$PATH %__cmake \\\ -DCMAKE_TOOLCHAIN_FILE=/usr/share/mingw/toolchain-mingw64.cmake \\\ - -DCMAKE_VERBOSE_MAKEFILE=ON \\\ -DBUILD_SHARED_LIBS:BOOL=ON \\\ -DLIB_INSTALL_DIR:PATH=%{mingw64_libdir} \\\ -DSYSCONF_INSTALL_DIR:PATH=%{mingw64_sysconfdir} \\\ diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec index 372fb5c..c752d93 100644 --- a/mingw-filesystem.spec +++ b/mingw-filesystem.spec @@ -320,6 +320,8 @@ install -m 0644 %{SOURCE12} $RPM_BUILD_ROOT%{_datadir}/mingw/ * Made the RPM macros mingw32_cmake, mingw32_cmake_kde4, mingw64_cmake and mingw64_cmake_kde4 more generic * Removed the rpath references as mingw doesn't support rpath + * Allow verbose CMake output to be disabled by setting the + environment variable MINGW_CMAKE_NO_VERBOSE (RHBZ #987644) * Sat Jun 07 2014 Fedora Release Engineering - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild