PCBC-1031: Do not fiddle with PHP_DEBUG and NDEBUG (#229)

Author: avsej

Makefile.frag

@@ -2,7 +2,7 @@ $(COUCHBASE_CMAKE_BUILD_DIRECTORY)/CMakeCache.txt: $(COUCHBASE_CMAKE_SOURCE_DIRE
 	$(CMAKE) \
 		-S $(COUCHBASE_CMAKE_SOURCE_DIRECTORY) \
 		-B $(COUCHBASE_CMAKE_BUILD_DIRECTORY) \
-		-DCMAKE_BUILD_TYPE=$(if $(COUCHBASE_CMAKE_BUILD_TYPE),$(COUCHBASE_CMAKE_BUILD_TYPE),RelWithDebInfo) \
+		-DCMAKE_BUILD_TYPE=$(if $(COUCHBASE_CMAKE_BUILD_TYPE),$(COUCHBASE_CMAKE_BUILD_TYPE),$(COUCHBASE_DEFAULT_CMAKE_BUILD_TYPE)) \
 		-DCMAKE_C_COMPILER="$(CC)" \
 		-DCMAKE_CXX_COMPILER="$(CXX)" \
 		-DCMAKE_C_FLAGS="$(COMMON_FLAGS)" \

config.m4

@@ -34,10 +34,16 @@ if test "$PHP_COUCHBASE" != "no"; then
   CXXFLAGS="${CXXFLAGS} -std=c++17"
   COUCHBASE_CMAKE_SOURCE_DIRECTORY="$srcdir/src"
   COUCHBASE_CMAKE_BUILD_DIRECTORY="$ac_pwd/cmake-build"
+  COUCHBASE_DEFAULT_CMAKE_BUILD_TYPE=RelWithDebInfo
+
+  if test "$PHP_DEBUG" = "yes" -o "$PHP_DEBUG" = "1"; then
+    COUCHBASE_DEFAULT_CMAKE_BUILD_TYPE=Debug
+  fi
 
   PHP_SUBST([CMAKE])
   PHP_SUBST([COUCHBASE_CMAKE_SOURCE_DIRECTORY])
   PHP_SUBST([COUCHBASE_CMAKE_BUILD_DIRECTORY])
+  PHP_SUBST([COUCHBASE_DEFAULT_CMAKE_BUILD_TYPE])
 
   PHP_NEW_EXTENSION(couchbase,, $ext_shared,,, cxx)
   PHP_ADD_EXTENSION_DEP(couchbase, json)

config.w32

@@ -65,12 +65,17 @@ if (PHP_COUCHBASE != "no") {
 
     EXTENSION("couchbase", "dummy.c", true);
 
+    COUCHBASE_DEFAULT_CMAKE_BUILD_TYPE="RelWithDebInfo"
+    if (PHP_DEBUG == "yes" || PHP_DEBUG == "1") {
+        COUCHBASE_DEFAULT_CMAKE_BUILD_TYPE="Debug"
+    }
+
     cmake_command =
         'cmd /c ""' + CMAKE  + '"' +
         ' -S "' + COUCHBASE_CMAKE_SOURCE_DIRECTORY + '"' +
         ' -B "' + COUCHBASE_CMAKE_BUILD_DIRECTORY + '"' +
         ' -G "NMake Makefiles"' +
-        ' -D CMAKE_BUILD_TYPE=RelWithDebInfo' +
+        ' -D CMAKE_BUILD_TYPE=' + COUCHBASE_DEFAULT_CMAKE_BUILD_TYPE +
         ' -D CMAKE_ASM_NASM_COMPILER:PATH="' + NASM + '"' +
         ' -D COUCHBASE_PHP_CFLAGS="' + COUCHBASE_PHP_CFLAGS + '"' +
         ' -D COUCHBASE_PHP_INCLUDES="' + COUCHBASE_PHP_INCLUDES + '"' +