mirror of
https://github.com/Unidata/netcdf-c.git
synced 2025-02-17 16:50:18 +08:00
Bumped version to 4.3.1.1 in preparation for upcoming bugfix release.
Modified the Doxyfile templates to use 'dot', when available, to generate class diagrams instead of the inferior diagram engine bundled in doxygen.
This commit is contained in:
Ward Fisher
parent
7786b78cfc
commit
7debd132d2
@ -16,7 +16,7 @@ set(PACKAGE "netCDF" CACHE STRING "")
|
||||
SET(netCDF_VERSION_MAJOR 4)
|
||||
SET(netCDF_VERSION_MINOR 3)
|
||||
SET(netCDF_VERSION_PATCH 1)
|
||||
SET(netCDF_VERSION_NOTE "")
|
||||
SET(netCDF_VERSION_NOTE ".1")
|
||||
SET(netCDF_VERSION ${netCDF_VERSION_MAJOR}.${netCDF_VERSION_MINOR}.${netCDF_VERSION_PATCH}${netCDF_VERSION_NOTE})
|
||||
SET(VERSION ${netCDF_VERSION})
|
||||
SET(netCDF_SO_VERSION 7.2.0)
|
||||
@ -36,6 +36,11 @@ getuname(cpu -m)
|
||||
set(BUILDNAME "${osname}-${osrel}-${cpu}" CACHE STRING "Build name variable for CDash")
|
||||
ENDIF()
|
||||
|
||||
# Determine if DOXYGEN and DOT are available. These will be used
|
||||
# when building the documentation.
|
||||
FIND_PROGRAM(NC_DOXYGEN NAMES doxygen)
|
||||
FIND_PROGRAM(NC_DOT NAMES dot)
|
||||
|
||||
# For CMAKE_INSTALL_LIBDIR
|
||||
INCLUDE(GNUInstallDirs)
|
||||
|
||||
@ -628,6 +633,15 @@ IF (ENABLE_DAP)
|
||||
INCLUDE_DIRECTORIES(${CURL_INCLUDE_DIRS})
|
||||
ENDIF()
|
||||
|
||||
# Check for the math library so it can be explicitely linked.
|
||||
IF(NOT WIN32)
|
||||
FIND_LIBRARY(HAVE_LIBM NAMES math m libm)
|
||||
MESSAGE(STATUS "Found Math library: ${HAVE_LIBM}")
|
||||
IF(NOT HAVE_LIBM)
|
||||
MESSAGE(FATAL_ERROR "Unable to find the math library.")
|
||||
ENDIF()
|
||||
ENDIF()
|
||||
|
||||
# Option to Enable DAP long tests, remote tests.
|
||||
OPTION(ENABLE_DAP_LONG_TESTS "Enable DAP long tests." OFF)
|
||||
OPTION(ENABLE_DAP_REMOTE_TESTS "Enable DAP remote tests." ON)
|
||||
@ -752,15 +766,31 @@ IF(ENABLE_PARALLEL_TESTS AND USE_PARALLEL)
|
||||
ENDIF()
|
||||
|
||||
# Determine whether or not to generate documentation.
|
||||
OPTION (ENABLE_DOXYGEN "Enable generation of doxygen." OFF)
|
||||
OPTION (ENABLE_DOXYGEN "Enable generation of doxygen." ON)
|
||||
IF(ENABLE_DOXYGEN)
|
||||
SET(BUILD_DOCS ON CACHE BOOL "")
|
||||
OPTION(ENABLE_INTERNAL_DOCS "Build internal documentation. This is of interest to developers only." OFF)
|
||||
IF(ENABLE_INTERNAL_DOCS)
|
||||
SET(BUILD_INTERNAL_DOCS YES CACHE STRING "")
|
||||
ELSE()
|
||||
SET(BUILD_INTERNAL_DOCS NO CACHE STRING "")
|
||||
ENDIF()
|
||||
IF(NC_DOXYGEN)
|
||||
SET(BUILD_DOCS ON CACHE BOOL "")
|
||||
|
||||
# Offer the option to build internal documentation.
|
||||
OPTION(ENABLE_INTERNAL_DOCS "Build internal documentation. This is of interest to developers only." OFF)
|
||||
IF(ENABLE_INTERNAL_DOCS)
|
||||
SET(BUILD_INTERNAL_DOCS YES CACHE STRING "")
|
||||
ELSE()
|
||||
SET(BUILD_INTERNAL_DOCS NO CACHE STRING "")
|
||||
ENDIF()
|
||||
|
||||
# Specify whether or not 'dot' was found on the system path.
|
||||
IF(NC_DOT)
|
||||
SET(HAVE_DOT YES CACHE STRING "")
|
||||
ELSE(NC_DOT)
|
||||
SET(HAVE_DOT NO CACHE_STRING "")
|
||||
ENDIF(NC_DOT)
|
||||
|
||||
ELSE(NC_DOXYGEN)
|
||||
MESSAGE(STATUS "Unable to build internal documentation. Doxygen does not appear to be on your executable path. Install doxygen and configure the project again.")
|
||||
ENDIF(NC_DOXYGEN)
|
||||
|
||||
|
||||
ENDIF()
|
||||
|
||||
# By default, MSVC has a stack size of 1000000.
|
||||
@ -908,15 +938,6 @@ CHECK_FUNCTION_EXISTS(_filelengthi64 HAVE_FILE_LENGTH_I64)
|
||||
#####
|
||||
|
||||
|
||||
# Check for the math library so it can be explicitely linked.
|
||||
IF(NOT WIN32)
|
||||
FIND_LIBRARY(HAVE_LIBM NAMES math m libm)
|
||||
MESSAGE(STATUS "Found Math library: ${HAVE_LIBM}")
|
||||
IF(NOT HAVE_LIBM)
|
||||
MESSAGE(FATAL_ERROR "Unable to find the math library.")
|
||||
ENDIF()
|
||||
ENDIF()
|
||||
|
||||
# Create config.h file, nc-config
|
||||
configure_file("${netCDF_SOURCE_DIR}/config.h.in.cmake"
|
||||
"${netCDF_BINARY_DIR}/config.h")
|
||||
|
||||
2
Doxyfile
2
Doxyfile
@ -32,7 +32,7 @@ PROJECT_NAME = netCDF-C
|
||||
# This could be handy for archiving the generated documentation or
|
||||
# if some version control system is used.
|
||||
|
||||
PROJECT_NUMBER = 4.3.1
|
||||
PROJECT_NUMBER = 4.3.1.1
|
||||
|
||||
# Using the PROJECT_BRIEF tag one can provide an optional one line description
|
||||
# for a project that appears at the top of each page and should give viewer
|
||||
|
||||
22
configure.ac
22
configure.ac
@ -15,7 +15,7 @@ AC_REVISION([$Id: configure.ac,v 1.450 2010/05/28 19:42:47 dmh Exp $])
|
||||
AC_PREREQ([2.59])
|
||||
|
||||
# Initialize with name, version, and support email address.
|
||||
AC_INIT([netCDF], [4.3.1], [support-netcdf@unidata.ucar.edu])
|
||||
AC_INIT([netCDF], [4.3.1.1], [support-netcdf@unidata.ucar.edu])
|
||||
|
||||
# Create the VERSION file, which contains the package version from
|
||||
# AC_INIT.
|
||||
@ -72,6 +72,11 @@ AC_ARG_ENABLE([doxygen],
|
||||
test "x$enable_doxygen" = xyes || enable_doxygen=no
|
||||
AM_CONDITIONAL([BUILD_DOCS], [test "x$enable_doxygen" = xyes])
|
||||
|
||||
AC_ARG_ENABLE([dot],
|
||||
[AS_HELP_STRING([--enable-dot],
|
||||
[Use dot (provided by graphviz) to generate charts and graphs in the doxygen-based documentation.])])
|
||||
test "x$enable_dot" = xyes || enable_dot=no
|
||||
|
||||
AC_ARG_ENABLE([internal-docs],
|
||||
[AS_HELP_STRING([--enable-internal-docs],
|
||||
[Include documentation of library internals. This is of interest only to those developing the netCDF library.])])
|
||||
@ -538,10 +543,23 @@ AC_CHECK_PROGS([DOXYGEN], [doxygen])
|
||||
if test -z "$DOXYGEN"; then
|
||||
AC_MSG_WARN([Doxygen not found - documentation will not be built])
|
||||
fi
|
||||
|
||||
# Is graphviz/dot installed? If so, we'll use dot to create
|
||||
# graphs in the documentation.
|
||||
AC_CHECK_PROGS([DOT], [dot])
|
||||
if test -z "$DOT"; then
|
||||
AC_MSG_WARN([dot not found - will use simple charts in documentation])
|
||||
HAVE_DOT=NO
|
||||
elif test "x$enable_dot" = xno; then
|
||||
HAVE_DOT=NO
|
||||
else
|
||||
HAVE_DOT=YES
|
||||
fi
|
||||
# If we have doxygen, and it's enabled, then process the file.
|
||||
if test "x$enable_doxygen" != xno; then
|
||||
if test -n "$DOXYGEN"; then
|
||||
AC_CONFIG_FILES([man4/Doxyfile])
|
||||
AC_SUBST(HAVE_DOT)
|
||||
AC_CONFIG_FILES([man4/Doxyfile])
|
||||
fi
|
||||
# Note: the list of files to input to doxygen
|
||||
# has been moved to man4/Doxyfile.in so
|
||||
|
||||
@ -1420,7 +1420,7 @@ HIDE_UNDOC_RELATIONS = YES
|
||||
# toolkit from AT&T and Lucent Bell Labs. The other options in this section
|
||||
# have no effect if this option is set to NO (the default)
|
||||
|
||||
HAVE_DOT = NO
|
||||
HAVE_DOT = @HAVE_DOT@
|
||||
|
||||
# By default doxygen will write a font called FreeSans.ttf to the output
|
||||
# directory and reference it in all dot files that doxygen generates. This
|
||||
@ -1468,7 +1468,7 @@ GROUP_GRAPHS = YES
|
||||
# collaboration diagrams in a style similar to the OMG's Unified Modeling
|
||||
# Language.
|
||||
|
||||
UML_LOOK = NO
|
||||
UML_LOOK = YES
|
||||
|
||||
# If set to YES, the inheritance and collaboration graphs will show the
|
||||
# relations between templates and their instances.
|
||||
|
||||
@ -1657,7 +1657,7 @@ HIDE_UNDOC_RELATIONS = YES
|
||||
# toolkit from AT&T and Lucent Bell Labs. The other options in this section
|
||||
# have no effect if this option is set to NO (the default)
|
||||
|
||||
HAVE_DOT = NO
|
||||
HAVE_DOT = @HAVE_DOT@
|
||||
|
||||
# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is
|
||||
# allowed to run in parallel. When set to 0 (the default) doxygen will
|
||||
@ -1710,7 +1710,7 @@ GROUP_GRAPHS = YES
|
||||
# collaboration diagrams in a style similar to the OMG's Unified Modeling
|
||||
# Language.
|
||||
|
||||
UML_LOOK = NO
|
||||
UML_LOOK = YES
|
||||
|
||||
# If the UML_LOOK tag is enabled, the fields and methods are shown inside
|
||||
# the class node. If there are many fields or methods and many nodes the
|
||||
|
||||
Loading…
Reference in New Issue
Block a user