rev 6141 - branches/kde4/cdbs

[Sune Vuorela]

Author: pusling-guest
Date: 2007-05-11 08:49:22 +0000 (Fri, 11 May 2007)
New Revision: 6141

Modified:
   branches/kde4/cdbs/cmake.mk
   branches/kde4/cdbs/kde.mk
Log:
try to enhance the builds a bit.


Modified: branches/kde4/cdbs/cmake.mk
===================================================================
--- branches/kde4/cdbs/cmake.mk	2007-05-11 08:06:21 UTC (rev 6140)
+++ branches/kde4/cdbs/cmake.mk	2007-05-11 08:49:22 UTC (rev 6141)
@@ -49,10 +49,11 @@
 common-configure-impl:: $(DEB_BUILDDIR)/CMakeCache.txt
 $(DEB_BUILDDIR)/CMakeCache.txt:
 	cd $(DEB_BUILDDIR) && cmake $(CURDIR)/$(DEB_SRCDIR) \
-	-DCMAKE_INSTALL_PREFIX="$(DEB_CMAKE_PREFIX)" \
+	-DCMAKE_INSTALL_PREFIX="$(DEB_CMAKE_PREFIX)" $(KDE4-ENABLE-FINAL) \
 	$(DEB_CMAKE_EXTRA_FLAGS) -DCMAKE_CXX_FLAGS="$(CXXFLAGS)" \
 	-DCMAKE_C_FLAGS="$(CFLAGS)" -DCMAKE_VERBOSE_MAKEFILE=ON $(DEB_CMAKE_DEBUG_FLAGS) \
-	-DCMAKE_SKIP_RPATH=true
+	-DCMAKE_SKIP_RPATH=true -DKDE4_BUILD_TESTS=true -DKDE_DISTRIBUTION_TEXT="Debian packages" \
+	-DLIBRARY_OUTPUT_PATH=/usr/lib -DSYSCONF_INSTALL_DIR=/etc
 	mkdir -p $(DEB_DESTDIR)
 
 cleanbuilddir::

Modified: branches/kde4/cdbs/kde.mk
===================================================================
--- branches/kde4/cdbs/kde.mk	2007-05-11 08:06:21 UTC (rev 6140)
+++ branches/kde4/cdbs/kde.mk	2007-05-11 08:49:22 UTC (rev 6141)
@@ -9,9 +9,21 @@
 
 DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_KDE_ENABLE_FINAL ?= yes
 
+DEB_CMAKE_EXTRA_FLAGS += -DKDE4_BUILD_TESTS=true -DKDE_DISTRIBUTION_TEXT="Debian packages"
 
+ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
+    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
+        KDE4-ENABLE-FINAL = $(if $(DEB_KDE_ENABLE_FINAL),-DKDE4_ENABLE_FINAL=true,)
+    else
+        KDE4-ENABLE-FINAL =
+    endif
+endif
 
+
+
 ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 	#no optimizations, full debug
        DEB_CMAKE_DEBUG_FLAGS = -DCMAKE_BUILD_TYPE=debugfull
@@ -21,3 +33,5 @@
 endif
 
 
+
+