conflict resolution

CMakeLists.txt

@@ -291,16 +291,16 @@ MACRO(print_conf_summary)
   MESSAGE("")
   MESSAGE("Configuration Summary:")
   MESSAGE("")
-  MESSAGE(STATUS "\tBuild Type:\t\t\t" ${CMAKE_BUILD_TYPE})
-  MESSAGE(STATUS "\tBuilding Shared Libraries:\t" ${BUILD_SHARED_LIBS})
-  MESSAGE(STATUS "\tBuilding netCDF-4:\t\t" ${ENABLE_NETCDF_4})
-  MESSAGE(STATUS "\tBuilding DAP Support:\t\t" ${ENABLE_DAP})
-  MESSAGE(STATUS "\tBuilding Utilities:\t\t" ${BUILD_UTILITIES})
+  MESSAGE(STATUS "Build Type:\t\t\t" ${CMAKE_BUILD_TYPE})
+  MESSAGE(STATUS "Building Shared Libraries:\t" ${BUILD_SHARED_LIBS})
+  MESSAGE(STATUS "Building netCDF-4:\t\t" ${ENABLE_NETCDF_4})
+  MESSAGE(STATUS "Building DAP Support:\t\t" ${ENABLE_DAP})
+  MESSAGE(STATUS "Building Utilities:\t\t" ${BUILD_UTILITIES})
   IF(CMAKE_PREFIX_PATH)
-    MESSAGE(STATUS "\tCMake Prefix Path:\t\t" "${CMAKE_PREFIX_PATH}")
+    MESSAGE(STATUS "CMake Prefix Path:\t\t" "${CMAKE_PREFIX_PATH}")
   ENDIF()
-  MESSAGE(STATUS "\tUsing pnetcdf:\t\t\t" ${STATUS_PNETCDF})
-  MESSAGE(STATUS "\tUsing Parallel IO:\t\t" ${STATUS_PARALLEL})
+  MESSAGE(STATUS "Using pnetcdf:\t\t\t" ${STATUS_PNETCDF})
+  MESSAGE(STATUS "Using Parallel IO:\t\t" ${STATUS_PARALLEL})
   MESSAGE("")
   IF(ENABLE_TESTS)
     MESSAGE(STATUS "\tTests Enabled:\t\t\t${ENABLE_TESTS}")
@@ -958,11 +958,10 @@ CHECK_FUNCTION_EXISTS(_filelengthi64 HAVE_FILE_LENGTH_I64)
 #####
 
 
-# Create config.h file, nc-config
+# Create config.h file.
 configure_file("${netCDF_SOURCE_DIR}/config.h.in.cmake"
   "${netCDF_BINARY_DIR}/config.h")
 ADD_DEFINITIONS(-DHAVE_CONFIG_H)
-INSTALL(PROGRAMS ${netCDF_BINARY_DIR}/nc-config DESTINATION bin COMPONENT utilities)
 INCLUDE_DIRECTORIES(${netCDF_BINARY_DIR})
 # End autotools-style checs for config.h
 
@@ -1131,11 +1130,22 @@ configure_file (
   ${netCDF_SOURCE_DIR}/netcdf.pc.in
   ${netCDF_BINARY_DIR}/netcdf.pc @ONLY)
 
-install (FILES ${netCDF_BINARY_DIR}/netcdf.pc
+
+FILE(MAKE_DIRECTORY ${netCDF_BINARY_DIR}/tmp)
+configure_file("${netCDF_SOURCE_DIR}/nc-config.in.cmake"
+  "${netCDF_BINARY_DIR}/tmp/nc-config" @ONLY)
+FILE(COPY "${netCDF_BINARY_DIR}/tmp/nc-config"
+  DESTINATION ${netCDF_BINARY_DIR}/
+  FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+
+
+INSTALL (FILES ${netCDF_BINARY_DIR}/netcdf.pc
   DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig )
 
+INSTALL(PROGRAMS ${netCDF_BINARY_DIR}/nc-config DESTINATION bin COMPONENT utilities)
+
 ###
-# End pkgconfig file creation.
+# End pkgconfig, nc-config file creation.
 ###
 
 ####
@@ -1219,18 +1229,6 @@ set (CPACK_COMPONENT_DOCUMENTATION_DESCRIPTION
 print_conf_summary()
 
 
-# Create nc-config
-FILE(MAKE_DIRECTORY ${netCDF_BINARY_DIR}/tmp)
-configure_file("${netCDF_SOURCE_DIR}/nc-config.in.cmake"
-  "${netCDF_BINARY_DIR}/tmp/nc-config" @ONLY)
-FILE(COPY "${netCDF_BINARY_DIR}/tmp/nc-config"
-  DESTINATION ${netCDF_BINARY_DIR}/
-  FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
-#EXECUTE_PROCESS(COMMAND "chmod 755 ${netCDF_BINARY_DIR}/nc-config")
-
-
-
-
 # Enable Makedist files.
 ADD_MAKEDIST()
 ENABLE_MAKEDIST(README COPYRIGHT RELEASE_NOTES INSTALL INSTALL.cmake test_prog.c lib_flags.am cmake CMakeLists.txt COMPILE.cmake.txt config.h.in.cmake cmake_uninstall.cmake.in netcdf-config-version.cmake.in netcdf-config.cmake.in FixBundle.cmake.in nc-config.in.cmake RELEASE_NOTES.md configure configure.ac install-sh config.h.in config.sub)

man4/Doxyfile.in

@@ -1431,7 +1431,7 @@ DISABLE_INDEX          = NO
 # JavaScript, DHTML, CSS and frames is required (i.e. any modern browser).
 # Windows users are probably better off using the HTML help feature.
 
-GENERATE_TREEVIEW      = YES
+GENERATE_TREEVIEW      = NO
 
 # The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
 # doxygen will group on one line in the generated HTML documentation.

man4/mainpage.dox

@@ -19,6 +19,10 @@ The NetCDF homepage may be found at <a href="http://www.unidata.ucar.edu/netcdf"
 - \ref release_notes
 - \ref getting_and_building_netcdf
 
+\subsubsection nightly_status The Latest NetCDF-C Build Status
+
+- <A href="http://my.cdash.org/index.php?project=netcdf-c">The NetCDF-C Nightly and Continuous Integration Dashboard</A>
+
 \subsection learn-more Learn more about using NetCDF-C
 
 - \ref tutorial
@@ -26,7 +30,6 @@ The NetCDF homepage may be found at <a href="http://www.unidata.ucar.edu/netcdf"
 - \ref netcdf_working_with_netcdf_files
 - <a class="el" href="http://www.unidata.ucar.edu/software/netcdf/docs/index-413.html">Older Documentation, plus details regarding netcdf-fortran and netcdf-cxx.</a>
 
-
 \subsection netcdf-cmake-windows NetCDF CMake and Windows support:
 - \ref netCDF-CMake
 - \ref winbin

nc-config.in.cmake

@@ -10,8 +10,8 @@ libdir=@CMAKE_INSTALL_PREFIX@/lib
 includedir=@CMAKE_INSTALL_PREFIX@/include
 
 cc="@CMAKE_C_COMPILER@"
-cflags="-I@CMAKE_INSTALL_PREFIX@/include @CMAKE_C_FLAGS@ @CMAKE_CPP_FLAGS@"
-libs="-L@CMAKE_INSTALL_PREFIX@/lib -l@ALL_TLL_LIBS@"
+cflags="-I@CMAKE_INSTALL_PREFIX@/include"
+libs="-L@CMAKE_INSTALL_PREFIX@/lib @NC_LIBS@"
 
 has_dap="@USE_DAP@"
 if [ -z $has_dap ]; then

ncdump/CMakeLists.txt

@@ -36,11 +36,11 @@ ADD_EXECUTABLE(nccopy ${nccopy_FILES})
 TARGET_LINK_LIBRARIES(ncdump netcdf ${ALL_TLL_LIBS})
 TARGET_LINK_LIBRARIES(nccopy netcdf ${ALL_TLL_LIBS})
 
-ADD_EXECUTABLE(bom bom.c)
-
 IF(ENABLE_TESTS)
 	ADD_EXECUTABLE(rewrite-scalar rewrite-scalar.c)
+	ADD_EXECUTABLE(bom bom.c)
 	TARGET_LINK_LIBRARIES(rewrite-scalar netcdf)
+	TARGET_LINK_LIBRARIES(bom netcdf)
 	# Base tests
 	# The tests are set up as a combination of shell scripts and executables that
 	# must be run in a particular order. It is painful but will use macros to help