diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2019-09-16 16:38:30 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2019-09-16 16:38:30 (GMT) |
| commit | c1c522f6ce8f6d7e44e6ea99860b19228f46952a (patch) | |
| tree | feafff39d43b8b72747540aaf9ccd6288c0846e3 /src | |
| parent | 72e8387bc9421de3af291c6b7d7df6c0d1fc4ec0 (diff) | |
| parent | b477f9bcc7bb83d7c06e1d09f428030f51d71897 (diff) | |
| download | hdf5-c1c522f6ce8f6d7e44e6ea99860b19228f46952a.zip hdf5-c1c522f6ce8f6d7e44e6ea99860b19228f46952a.tar.gz hdf5-c1c522f6ce8f6d7e44e6ea99860b19228f46952a.tar.bz2 | |
Merge pull request #1922 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'b477f9bcc7bb83d7c06e1d09f428030f51d71897':
HDFFV-10901 add missing config options
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/H5make_libsettings.c | 13 |
2 files changed, 8 insertions, 7 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 97ae847..6df8af3 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1135,7 +1135,6 @@ if (NOT ONLY_SHARED_LIBS) PUBLIC ${HDF_EXTRA_C_FLAGS} ${HDF_EXTRA_FLAGS} - $<IF:$<CONFIG:Debug>,DEBUG,NDEBUG> PRIVATE $<$<BOOL:${HDF5_ENABLE_TRACE}>:H5_DEBUG_API> # Enable tracing of the API $<$<BOOL:${HDF5_ENABLE_DEBUG_APIS}>:H5Z_DEBUG;H5T_DEBUG;H5ST_DEBUG;H5S_DEBUG;H5O_DEBUG;H5I_DEBUG;H5HL_DEBUG;H5F_DEBUG;H5D_DEBUG;H5B2_DEBUG;H5AC_DEBUG> @@ -1173,7 +1172,6 @@ if (BUILD_SHARED_LIBS) "H5_BUILT_AS_DYNAMIC_LIB" ${HDF_EXTRA_C_FLAGS} ${HDF_EXTRA_FLAGS} - $<IF:$<CONFIG:Debug>,DEBUG,NDEBUG> PRIVATE $<$<BOOL:${HDF5_ENABLE_THREADSAFE}>:H5_HAVE_THREADSAFE> $<$<BOOL:${HDF5_ENABLE_TRACE}>:H5_DEBUG_API> # Enable tracing of the API diff --git a/src/H5make_libsettings.c b/src/H5make_libsettings.c index da7c8d9..fd67184 100644 --- a/src/H5make_libsettings.c +++ b/src/H5make_libsettings.c @@ -35,12 +35,15 @@ static const char *FileHeader = "\n\ #include <stdio.h> #include <time.h> #include "H5private.h" +/* Do NOT use HDfprintf in this file as it is not linked with the library, + * which contains the H5system.c file in which the function is defined. + */ #define LIBSETTINGSFNAME "libhdf5.settings" FILE *rawoutstream = NULL; - + /*------------------------------------------------------------------------- * Function: insert_libhdf5_settings * @@ -105,7 +108,7 @@ insert_libhdf5_settings(FILE *flibinfo) #endif } /* insert_libhdf5_settings() */ - + /*------------------------------------------------------------------------- * Function: make_libinfo * @@ -123,7 +126,7 @@ make_libinfo(void) insert_libhdf5_settings(rawoutstream); } - + /*------------------------------------------------------------------------- * Function: print_header * @@ -229,7 +232,7 @@ information about the library build configuration\n"; fprintf(rawoutstream, "\n */\n\n"); } - + /*------------------------------------------------------------------------- * Function: print_footer * @@ -244,7 +247,7 @@ print_footer(void) /* nothing */ } - + /*------------------------------------------------------------------------- * Function: main * |