diff --git a/CMakeLists.txt b/CMakeLists.txt index ddf04c5a0..03deacff0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,8 @@ project(NetCDF C) SET(NetCDF_VERSION_MAJOR 4) SET(NetCDF_VERSION_MINOR 2) SET(NetCDF_VERSION_PATCH 3) -SET(NetCDF_VERSION ${NetCDF_VERSION_MAJOR}.${NetCDF_VERSION_MINOR}.${NetCDF_VERSION_PATCH}) +SET(NetCDF_VERSION_NOTE "-rc1") +SET(NetCDF_VERSION ${NetCDF_VERSION_MAJOR}.${NetCDF_VERSION_MINOR}.${NetCDF_VERSION_PATCH}${NetCDF_VERSION_NOTE}) SET(VERSION ${NetCDF_VERSION}) ENABLE_TESTING() @@ -700,7 +701,7 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/COPYRIGHT SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_BINARY_DIR}/COPYRIGHT.txt") IF(NOT CPACK_PACK_VERSION) - SET(CPACK_PACKAGE_VERSION "4.2.x-rc1") + SET(CPACK_PACKAGE_VERSION ${VERSION}) ENDIF() IF(APPLE) SET(CPACK_SOURCE_GENERATOR "TBZ2" "ZIP") diff --git a/man4/Doxyfile.in.cmake b/man4/Doxyfile.in.cmake index 8ffae2500..a48226c72 100644 --- a/man4/Doxyfile.in.cmake +++ b/man4/Doxyfile.in.cmake @@ -32,7 +32,7 @@ PROJECT_NAME = netCDF # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = @CPACK_PACKAGE_VERSION@ +PROJECT_NUMBER = @VERSION@ # 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 diff --git a/man4/install.doc b/man4/install.doc index 4e080437a..83835ab88 100644 --- a/man4/install.doc +++ b/man4/install.doc @@ -249,7 +249,7 @@ cc -o myapp myapp.c `nc-config --cflags --libs` \page build_windows Building with Windows -See the <a href="http://www.unidata.ucar.edu/netcdf/windows_netcdf/" +See the <a href="http://www.unidata.ucar.edu/netcdf/win_netcdf/" >NetCDF for Windows </a> page for Current information about building netCDF on Windows or downloading prebuilt Windows binaries. diff --git a/man4/mainpage.doc b/man4/mainpage.doc index f7463e8c3..a37876533 100644 --- a/man4/mainpage.doc +++ b/man4/mainpage.doc @@ -14,7 +14,7 @@ Programs</a> (UCP). Unidata is funded primarily by the National Science Foundation. \authors Russ Rew, Glenn Davis, Steve Emmerson, Harvey Davies, Ed -Hartnett, and Dennis Heimbigner +Hartnett, Dennis Heimbigner and Ward Fisher <p>Learn more about netCDF: - \ref getting @@ -22,7 +22,7 @@ Hartnett, and Dennis Heimbigner - \ref windows - \ref tutorial - \ref user_guide - +- <A HREF="http://www.unidata.ucar.edu/software/netcdf/docs/index-413.html">Documentation for 4.1.3 (in previous form)</A> \internal The dispatch interface within the netCDF library allows the netCDF API