[openjk] 06/15: debian/rules: use CMAKE_BUILD_TYPE=None now that that works

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch master
in repository openjk.

commit 8c30d25c27a502dfc444c73de0afd0e0cc290a73
Author: Simon McVittie <smcv at debian.org>
Date:   Sat Aug 1 21:49:38 2015 +0100

    debian/rules: use CMAKE_BUILD_TYPE=None now that that works
    
    This means we have to use -DNDEBUG manually.
---
 debian/changelog |  1 +
 debian/rules     | 12 +++++-------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4992490..f610160 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ openjk (0~20150731+dfsg1-1) UNRELEASED; urgency=medium
   * Drop patch to avoid direct libX11 dependency, no longer needed
     with CMake 3.2
   * debian/rules: add convenience "maintainer-get-orig-source" target
+  * debian/rules: use CMAKE_BUILD_TYPE=None now that that works
 
  -- Simon McVittie <smcv at debian.org>  Mon, 27 Jul 2015 23:12:50 +0100
 
diff --git a/debian/rules b/debian/rules
index 0b6c91e..f02d840 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,16 +16,14 @@ DEB_CFLAGS_MAINT_APPEND := \
 DEB_CXXFLAGS_MAINT_APPEND := \
 	$(compiler_flags) \
 	$(NULL)
+# OpenJK assumes that absence of -D_DEBUG implies -DNDEBUG
+DEB_CPPFLAGS_MAINT_APPEND := \
+	-DNDEBUG \
+	$(NULL)
 DEB_LDFLAGS_MAINT_APPEND := \
 	-lm \
 	$(NULL)
 
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CMAKE_BUILD_TYPE = RELWITHDEBINFO
-else
-	CMAKE_BUILD_TYPE = DEBUG
-endif
-
 include /usr/share/dpkg/default.mk
 
 # OpenJK upstream consider their support for Jedi Knight II: Jedi Outcast
@@ -63,7 +61,7 @@ override_dh_auto_configure:
 		-DBuildJK2SPEngine=$(with_jk2) \
 		-DBuildJK2SPRdVanilla=$(with_jk2) \
 		-DBuildJK2SPGame=$(with_jk2) \
-		-DCMAKE_BUILD_TYPE=$(CMAKE_BUILD_TYPE) \
+		-DCMAKE_BUILD_TYPE=None \
 		-DCMAKE_INSTALL_PREFIX=/usr/lib/openjk \
 		-DCMAKE_VERBOSE_MAKEFILE=TRUE \
 		$(NULL)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/openjk.git