[kde-filesystem] macros.kde4: %cmake_kde4 add -DKDE4_BUILD_TESTS=OFF

Rex Dieter rdieter at fedoraproject.org
Mon Dec 3 19:58:54 UTC 2012


commit 3274e3db18ef919483a10cb9ed04d8427cfbafd7
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Dec 3 13:59:04 2012 -0600

    macros.kde4: %cmake_kde4 add -DKDE4_BUILD_TESTS=OFF

 kde-filesystem.spec |    5 ++++-
 macros.kde4         |    5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/kde-filesystem.spec b/kde-filesystem.spec
index 085faab..9d9b341 100644
--- a/kde-filesystem.spec
+++ b/kde-filesystem.spec
@@ -17,7 +17,7 @@
 Summary: KDE filesystem layout
 Name: kde-filesystem
 Version: 4
-Release: 40%{?dist}
+Release: 41%{?dist}
 
 Group: System Environment/Base
 License: Public Domain
@@ -175,6 +175,9 @@ rm -rf $RPM_BUILD_ROOT %{name}.list
 
 
 %changelog
+* Mon Dec 03 2012 Rex Dieter <rdieter at fedoraproject.org> 4-41
+- macros.kde4: %%cmake_kde4 add -DKDE4_BUILD_TESTS=OFF
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4-40
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/macros.kde4 b/macros.kde4
index e5bd5c3..884bc81 100644
--- a/macros.kde4
+++ b/macros.kde4
@@ -6,6 +6,8 @@
 # initial try, including only items that vary from defaults
 #
 
+%_kde4_build_tests -DKDE4_BUILD_TESTS:BOOL=OFF
+
 %cmake_kde4 \
   QTDIR="%{_qt4_prefix}" ; export QTDIR ; \
   PATH="%{_qt4_bindir}:$PATH" ; export PATH ; \
@@ -16,10 +18,11 @@
     -DBUILD_SHARED_LIBS:BOOL=ON \\\
     -DCMAKE_BUILD_TYPE=%{_kde4_buildtype} \\\
     -DCMAKE_INSTALL_PREFIX:PATH=%{_kde4_prefix} \\\
-    -DCMAKE_VERBOSE_MAKEFILE=ON \\\
+    -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \\\
     -DDATA_INSTALL_DIR:PATH=%{_kde4_appsdir} \\\
     -DINCLUDE_INSTALL_DIR:PATH=%{_kde4_includedir} \\\
     -DLIB_INSTALL_DIR:PATH=%{_kde4_libdir} \\\
+    %{?_kde4_build_tests} \\\
 %if "%{?_lib}" == "lib64" \
      %{?_cmake_lib_suffix64} \\\
 %endif \


More information about the scm-commits mailing list