Allow verbose CMake output to be disabled (RHBZ #987644)

This commit is contained in:
Erik van Pienbroek 2015-04-10 20:46:49 +02:00
parent 5da13e5526
commit 6e3f91139b
3 changed files with 8 additions and 2 deletions

View File

@ -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} \\\

View File

@ -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} \\\

View File

@ -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 <rel-eng@lists.fedoraproject.org>
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild