[svn-r28995] Removed unused packages from list in --enable-debug=<pkgs> configure

option (also updated CMake).

Tested on: 64-bit Ubuntu 15.10 (Linux 4.2.0 x86_64) gcc 5.2.1
           serial autotools
           serial CMake (CMake 3.3.2)
This commit is contained in:
Dana Robinson 2016-01-27 15:51:40 -05:00
parent 7abd70b809
commit 7afa7bb6af
4 changed files with 3 additions and 19 deletions

View File

@ -1863,10 +1863,10 @@ if test "X-$DEBUG_PKG" = X- ; then
fi
AC_SUBST([DEBUG_PKG])
all_packages="ac,b,b2,d,e,f,g,hg,hl,i,mf,mm,o,p,s,st,t,v,z"
all_packages="AC,B,B2,D,F,I,HL,O,S,ST,T,Z"
case "X-$DEBUG_PKG" in
X-yes)
DEBUG_PKG="d,e,f,g,hg,i,mm,o,p,s,t,v,z"
DEBUG_PKG="D,F,I,O,S,T,Z"
## H5_CPPFLAGS="$H5_CPPFLAGS -UNDEBUG"
AC_MSG_RESULT([default ($DEBUG_PKG)])
;;

View File

@ -860,7 +860,7 @@ option (HDF5_ENABLE_DEBUG_APIS "Turn on debugging in all packages" OFF)
if (HDF5_ENABLE_DEBUG_APIS)
set_target_properties (${HDF5_LIB_TARGET} PROPERTIES
COMPILE_DEFINITIONS
"H5Z_DEBUG;H5VM_DEBUG;H5T_DEBUG;H5S_DEBUG;H5P_DEBUG;H5O_DEBUG;H5MM_DEBUG;H5MF_DEBUG;H5I_DEBUG;H5HL_DEBUG;H5HG_DEBUG;H5G_DEBUG;H5F_DEBUG;H5E_DEBUG;H5D_DEBUG;H5B_DEBUG;H5AC_DEBUG"
"H5Z_DEBUG;H5T_DEBUG;H5ST_DEBUG;H5S_DEBUG;H5O_DEBUG;H5I_DEBUG;H5HL_DEBUG;H5F_DEBUG;H5D_DEBUG;H5B2_DEBUG;H5B_DEBUG;H5AC_DEBUG"
)
endif (HDF5_ENABLE_DEBUG_APIS)
set (install_targets ${HDF5_LIB_TARGET})

View File

@ -36,13 +36,6 @@
#include "H5Fprivate.h" /* File access */
#include "H5RSprivate.h" /* Reference-counted strings */
/*
* Define this to enable debugging.
*/
#ifdef NDEBUG
# undef H5G_DEBUG
#endif
/*
* The disk size for a symbol table entry...
*/

View File

@ -21,8 +21,6 @@
*
* Purpose: Private header file for file memory management.
*
* Modifications:
*
*-------------------------------------------------------------------------
*/
#ifndef _H5MFprivate_H
@ -36,13 +34,6 @@
/* Library Private Macros */
/**************************/
/*
* Feature: Define H5MF_DEBUG on the compiler command line if you want to
* see diagnostics from this layer.
*/
#ifdef NDEBUG
# undef H5MF_DEBUG
#endif
/****************************/
/* Library Private Typedefs */