Added initial 'make dist', 'make distcheck' support to

CMake-based builds.
2025-04-12 18:10:24 +08:00 · 2013-06-03 16:42:04 +00:00 · 2013-06-03 16:42:04 +00:00 · 33d3d06971
commit 33d3d06971
parent 946a7ab8b5
34 changed files with 261 additions and 35 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -80,7 +80,6 @@ FIND_PACKAGE(PkgConfig QUIET)
 ## Enable 'dist and distcheck'.
 ## File taken from http://ensc.de/cmake/FindMakeDist.cmake
 FIND_PACKAGE(MakeDist)
-ADD_MAKEDIST()


 ## End 'enable dist and distcheck'
@ -104,7 +103,6 @@ MACRO(ADD_EXTRA_DIST files)
  FOREACH(F ${files})
    SET(EXTRA_DIST ${EXTRA_DIST} ${CMAKE_CURRENT_SOURCE_DIR}/${F})
    SET(EXTRA_DIST ${EXTRA_DIST} PARENT_SCOPE)
-  
  ENDFOREACH()
 ENDMACRO()

@ -710,15 +708,17 @@ IF(NOT WIN32)
       ENDIF()
 ENDIF()

-# Create config.h file
+# Create config.h file, nc-config
 configure_file("${netCDF_SOURCE_DIR}/config.h.in.cmake"
 	"${netCDF_BINARY_DIR}/config.h")
+
+FILE(MAKE_DIRECTORY ${netCDF_BINARY_DIR}/tmp)
 configure_file("${netCDF_SOURCE_DIR}/nc-config.in.cmake"
-  "${netCDF_SOURCE_DIR}/nc-config")
-FILE(COPY "${netCDF_SOURCE_DIR}/nc-config"
-  DESTINATION "${netCDF_BINARY_DIR}"
-  FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE)
-EXECUTE_PROCESS(COMMAND "chmod 755 ${netCDF_BINARY_DIR}/nc-config")
+  "${netCDF_BINARY_DIR}/tmp/nc-config")
+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")

 INSTALL(PROGRAMS ${netCDF_BINARY_DIR}/nc-config DESTINATION bin COMPONENT utilities)
 INCLUDE_DIRECTORIES(${netCDF_BINARY_DIR})
@ -801,9 +801,7 @@ ENDIF()
 #####
 # Build doxygen documentation, if need be.
 #####
-IF(BUILD_DOCS)
-	ADD_SUBDIRECTORY(man4)
-ENDIF()
+ADD_SUBDIRECTORY(man4)
 #####
 # Moving on to CPack, install packages.
 #####
@ -936,7 +934,8 @@ set (CPACK_COMPONENT_DOCUMENTATION_DESCRIPTION
 print_conf_summary()

 # Enable Makedist files.
-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)
+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)

 # CPack inclusion must come last.
 INCLUDE(CPack)
--- a/examples/C/CMakeLists.txt
+++ b/examples/C/CMakeLists.txt
@ -3,11 +3,22 @@ SET(CMAKE_INCLUDE_CURRENT_DIR ON)
 INCLUDE_DIRECTORIES(".")

 SET(exam_C_tests simple_xy_wr simple_xy_rd sfc_pres_temp_wr sfc_pres_temp_rd pres_temp_4D_wr pres_temp_4D_rd)
+SET(exam_C_tests_source "")
+FOREACH(F ${exam_C_tests}) 
+  set(exam_C_tests_source ${exam_C_test_source} ${F}.c)
+ENDFOREACH()

 FOREACH(F ${exam_C_tests})
 	add_bin_test(C_tests ${F})
 ENDFOREACH()

+
+## Specify files to be distributed by 'make dist'
+FILE(GLOB CUR_EXTRA_DIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*.c ${CMAKE_CURRENT_SOURCE_DIR}/*.h ${CMAKE_CURRENT_SOURCE_DIR}/*.sh)
+SET(CUR_EXTRA_DIST ${CUR_EXTRA_DIST} CMakeLists.txt Makefile.am)
+ADD_EXTRA_DIST("${CUR_EXTRA_DIST}")
+
+
 SET(CLEANFILES sfc_pres_temp.nc simple_xy.nc pres_temp_4D.nc simple_nc4.nc simple_xy_nc4.nc)
 SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${CLEANFILES}")

--- a/examples/CDL/CMakeLists.txt
+++ b/examples/CDL/CMakeLists.txt
@ -12,6 +12,12 @@ FOREACH(F ${CDL_EXAMPLE_TESTS})
 	add_sh_test(cdl ${F})
 ENDFOREACH()

+FILE(GLOB CUR_EXTRA_DIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*.h ${CMAKE_CURRENT_SOURCE_DIR}/*.sh)
+SET(CUR_EXTRA_DIST ${CUR_EXTRA_DIST} simple_xy.cdl sfc_pres_temp.cdl pres_temp_4D.cdl CMakeLists.txt Makefile.am create_sample_files.sh do_comps.sh)
+
+ADD_EXTRA_DIST("${CUR_EXTRA_DIST}")
+
+
 SET(CLEANFILES simple_xy.nc sfc_pres_temp.nc pres_temp_4D.nc)
 SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${CLEANFILES}")

--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@ -8,3 +8,7 @@ IF(BUILD_UTILITIES)
 	ADD_SUBDIRECTORY(CDL)
 ENDIF()

+SET(CUR_EXTRA_DIST CMakeLists.txt Makefile.am)
+ADD_EXTRA_DIST("${CUR_EXTRA_DIST}")
+
+
--- a/h5_test/CMakeLists.txt
+++ b/h5_test/CMakeLists.txt
@ -14,7 +14,9 @@ FOREACH(CTEST ${H5TESTS})
 ENDFOREACH()


-
-
+FILE(GLOB CUR_EXTRA_DIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*.c ${CMAKE_CURRENT_SOURCE_DIR}/*.h ${CMAKE_CURRENT_SOURCE_DIR}/*.sh)
+SET(CUR_EXTRA_DIST ${CUR_EXTRA_DIST} ref_tst_h_compounds.h5 ref_tst_h_compounds2.h5 ref_tst_compounds.nc CMakeLists.txt Makefile.am)
+
+ADD_EXTRA_DIST("${CUR_EXTRA_DIST}")


--- a/include/CMakeLists.txt
+++ b/include/CMakeLists.txt
@ -1,3 +1,9 @@
 SET(CMAKE_INCLUDE_CURRENT_DIR ON)

+
+
 INCLUDE_DIRECTORIES(".")
+
+FILE(GLOB CUR_EXTRA_DIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*.h)
+SET(CUR_EXTRA_DIST ${CUR_EXTRA_DIST} Makefile.am CMakeLists.txt)
+ADD_EXTRA_DIST("${CUR_EXTRA_DIST}")
--- a/libcdmr/CMakeLists.txt
+++ b/libcdmr/CMakeLists.txt
@ -6,8 +6,8 @@ SET(cdmr_SOURCES nccrcvt.c nccr.c nccrdispatch.c crmeta.c nccrproto.c nccrgetvar

 add_library(cdmr OBJECT ${cdmr_SOURCES}) 

-
-
-
+FILE(GLOB CUR_EXTRA_DIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*.h ${CMAKE_CURRENT_SOURCE_DIR}/*.c)
+SET(CUR_EXTRA_DIST ${CUR_EXTRA_DIST} CMakeLists.txt Makefile.am cce.y ast.jar ncStream.proto extends.sed)
+ADD_EXTRA_DIST("${CUR_EXTRA_DIST}")


--- a/libdap2/CMakeLists.txt
+++ b/libdap2/CMakeLists.txt
@ -30,3 +30,6 @@ IF (BUILD_PARALLEL)
 	SET(ARGS_MANPAGE ${ARGS_MANPAGE} -DPARALLEL_IO=TRUE)
 ENDIF(BUILD_PARALLEL)

+FILE(GLOB CUR_EXTRA_DIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*.c ${CMAKE_CURRENT_SOURCE_DIR}/*.h)
+SET(CUR_EXTRA_DIST ${CUR_EXTRA_DIST} dce.y CMakeLists.txt Makefile.am)
+ADD_EXTRA_DIST("${CUR_EXTRA_DIST}")
--- a/libdispatch/CMakeLists.txt
+++ b/libdispatch/CMakeLists.txt
@ -16,4 +16,6 @@ ENDIF(BUILD_V2)

 add_library(dispatch OBJECT ${libdispatch_SOURCES}) 

-
+FILE(GLOB CUR_EXTRA_DIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*.h ${CMAKE_CURRENT_SOURCE_DIR}/*.c)
+SET(CUR_EXTRA_DIST ${CUR_EXTRA_DIST} CMakeLists.txt Makefile.am)
+ADD_EXTRA_DIST("${CUR_EXTRA_DIST}")
--- a/liblib/CMakeLists.txt
+++ b/liblib/CMakeLists.txt
@ -84,3 +84,7 @@ INSTALL(TARGETS netcdf EXPORT netcdf-targets RUNTIME DESTINATION bin COMPONENT l
 		       )

 SET(ALL_TLL_LIBS ${TLL_LIBS} PARENT_SCOPE)
+
+FILE(GLOB CUR_EXTRA_DIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*.h ${CMAKE_CURRENT_SOURCE_DIR}/*.c)
+SET(CUR_EXTRA_DIST ${CUR_EXTRA_DIST} CMakeLists.txt Makefile.am)
+ADD_EXTRA_DIST("${CUR_EXTRA_DIST}")
--- a/libsrc/CMakeLists.txt
+++ b/libsrc/CMakeLists.txt
@ -29,6 +29,13 @@ ENDIF (USE_FFIO)

 add_library(netcdf3 OBJECT ${libsrc_SOURCES}) 

+# Add files to the distribution
+FILE(GLOB libsrc_HEADERS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*.h)
+SET(CUR_EXTRA_DIST attr.m4 ncx.m4 putget.m4 XGetopt.c memio.c mmapio.c ffio.c posixio.c CMakeLists.txt Makefile.am)
+ADD_EXTRA_DIST("${libsrc_SOURCES}")
+ADD_EXTRA_DIST("${libsrc_HEADERS}") 
+ADD_EXTRA_DIST("${CUR_EXTRA_DIST}")
+
 # The C API man page.
 set(man_MANS netcdf.3)

@ -51,4 +58,3 @@ IF (BUILD_PARALLEL)
 	SET(ARGS_MANPAGE ${ARGS_MANPAGE} -DPARALLEL_IO=TRUE)
 ENDIF(BUILD_PARALLEL)

-ADD_EXTRA_DIST("${libsrc_SOURCES}" attr.m4 ncx.m4 putget.m4 XGetopt.c)
--- a/libsrc4/CMakeLists.txt
+++ b/libsrc4/CMakeLists.txt
@ -12,6 +12,13 @@ ENDIF()

 add_library(netcdf4 OBJECT ${libsrc4_SOURCES}) 

+# Files for make dist
+FILE(GLOB libsrc4_HEADERS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*.h ${CMAKE_CURRENT_SOURCE_DIR}/*.sh)
+SET(CUR_EXTRA_DIST error4.c CMakeLists.txt Makefile.am)
+ADD_EXTRA_DIST("${libsrc4_SOURCES}")
+ADD_EXTRA_DIST("${libsrc4_HEADERS}")
+ADD_EXTRA_DIST("${CUR_EXTRA_DIST}")
+
 ###
 # Options related to the man page generation.
 ###
@ -20,6 +27,7 @@ add_library(netcdf4 OBJECT ${libsrc4_SOURCES})
 # The C API man page.
 ###

+
 set(man_MANS netcdf.3)

 set(ARGS_MANPAGE -DAPI=C)
--- a/libsrc5/CMakeLists.txt
+++ b/libsrc5/CMakeLists.txt
@ -7,4 +7,4 @@ SET(libsrc5_SOURCES nc5dispatch.c)

 add_library(netcdf5 OBJECT ${libsrc_SOURCES}) 

-
+ADD_EXTRA_DIST(${libsrc5_SOURCES} CMakeLists.txt)
--- a/man4/CMakeLists.txt
+++ b/man4/CMakeLists.txt
@ -27,3 +27,6 @@ IF(BUILD_DOCS)
 	ENDIF()
 ENDIF()

+SET(CUR_EXTRA_DIST ${CUR_EXTRA_DIST} CMakeLists.txt Makefile.am netcdf.m4 DoxygenLayout.xml Doxyfile.in footer.html mainpage.doc tutorial.doc install.doc dispatch.doc guide.doc types.doc notes.doc cdl.doc architecture.doc internal.doc Doxyfile.in.cmake windows-binaries.md Building-with-CMake.md)
+
+ADD_EXTRA_DIST("${CUR_EXTRA_DIST}")
--- a/man4/guide.doc
+++ b/man4/guide.doc
@ -2571,6 +2571,14 @@ dimensions. Be aware that an unlimited dimension with chunksize > 1
 may result in slower performance for record-oriented access patterns
 that where common with netcdf-3.

+For unlimited dimensions, a chunk size of one is always used. For
+large datasets, where the size of fixed dimensions is small compared
+to the unlimited dimensions, users are advised to avoid unlimited
+dimensions or to increase the chunk sizes of the unlimited
+dimensions. Be aware that an unlimited dimension with chunksize > 1
+may result in slower performance for record-oriented access patterns
+that where common with netcdf-3.
+
 \page chunking_parallel_io Chunking and Parallel I/O

 When files are opened for read/write parallel I/O access, the chunk
--- a/nc_test/CMakeLists.txt
+++ b/nc_test/CMakeLists.txt
@ -60,3 +60,8 @@ ENDIF()
 FILE(GLOB COPY_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.nc ${CMAKE_CURRENT_SOURCE_DIR}/*.sh)
 FILE(COPY ${COPY_FILES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/)

+## Specify files to be distributed by 'make dist'
+FILE(GLOB CUR_EXTRA_DIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*.c ${CMAKE_CURRENT_SOURCE_DIR}/*.h ${CMAKE_CURRENT_SOURCE_DIR}/*.sh)
+SET(CUR_EXTRA_DIST ${CUR_EXTRA_DIST} CMakeLists.txt Makefile.am)
+SET(CUR_EXTRA_DIST ${CUR_EXTRA_DIST} test_get.m4 test_put.m4 ref_tst_diskless2.cdl)
+ADD_EXTRA_DIST("${CUR_EXTRA_DIST}")
--- a/nc_test4/CMakeLists.txt
+++ b/nc_test4/CMakeLists.txt
@ -67,5 +67,11 @@ IF(USE_PNETCDF)
 	build_bin_test_no_prefix(tst_pnetcdf)
 	build_bin_test_no_prefix(tst_parallel2)
 	add_sh_test(nc_test4 run_pnetcdf_test)
-	#add_sh_test(nc_test4 run_pnetcdf_test)
 ENDIF()
+
+## Specify files to be distributed by 'make dist'
+FILE(GLOB CUR_EXTRA_DIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*.c ${CMAKE_CURRENT_SOURCE_DIR}/*.h ${CMAKE_CURRENT_SOURCE_DIR}/*.sh)
+SET(CUR_EXTRA_DIST ${CUR_EXTRA_DIST} CMakeLists.txt Makefile.am)
+SET(CUR_EXTRA_DIST ${CUR_EXTRA_DIST} ref_chunks1.cdl ref_chunks2.cdl ref_tst_compounds.nc ref_tst_xplatform2_1.nc ref_tst_xplatform2_2.nc ref_tst_dims.nc ref_tst_interops4.nc)
+
+ADD_EXTRA_DIST("${CUR_EXTRA_DIST}")
--- a/ncdap_test/CMakeLists.txt
+++ b/ncdap_test/CMakeLists.txt
@ -8,7 +8,7 @@ SET(abs_top_srcdir ${CMAKE_CURRENT_SOURCE_DIR})
 remove_definitions(-DDLL_EXPORT)
 add_definitions(-D"TOPSRCDIR=${CMAKE_SOURCE_DIR}")

-FILE(GLOB COPY_FILES ${CMAKE_CURRENT_SOURCE_DIR}/testdata3 ${CMAKE_CURRENT_SOURCE_DIR}/expected3 ${CMAKE_CURRENT_SOURCE_DIR}/expected4 ${CMAKE_CURRENT_SOURCE_DIR}/expectremote3 ${CMAKE_CURRENT_SOURCE_DIR}/expectremote4 ${CMAKE_CURRENT_SOURCE_DIR}/*.sh)
+FILE(GLOB COPY_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.sh)

 FILE(COPY ${COPY_FILES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/ FILE_PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE) 

@ -43,3 +43,18 @@ IF(ENABLE_TESTS)
 	
 ENDIF()

+ADD_SUBDIRECTORY(expected3)
+ADD_SUBDIRECTORY(expected4)
+ADD_SUBDIRECTORY(expectremote3)
+ADD_SUBDIRECTORY(expectremote4)
+ADD_SUBDIRECTORY(expecttds3)
+ADD_SUBDIRECTORY(nocacheremote3)
+ADD_SUBDIRECTORY(nocacheremote4)
+ADD_SUBDIRECTORY(special3)
+ADD_SUBDIRECTORY(testdata3)
+
+
+## Specify files to be distributed by 'make dist'
+FILE(GLOB CUR_EXTRA_DIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*.c ${CMAKE_CURRENT_SOURCE_DIR}/*.h ${CMAKE_CURRENT_SOURCE_DIR}/*.sh)
+SET(CUR_EXTRA_DIST ${CUR_EXTRA_DIST} CMakeLists.txt Makefile.am)
+ADD_EXTRA_DIST("${CUR_EXTRA_DIST}")
--- a/ncdap_test/expected3/CMakeLists.txt
+++ b/ncdap_test/expected3/CMakeLists.txt
@ -0,0 +1,10 @@
+SET(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+INCLUDE_DIRECTORIES(".")
+
+FILE(GLOB COPY_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*)
+FILE(COPY ${COPY_FILES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/ FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE)
+
+FILE(GLOB CUR_EXTRA_DIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*)
+SET(CUR_EXTRA_DIST ${CUR_EXTRA_DIST} CMakeLists.txt Makefile.am)
+ADD_EXTRA_DIST("${CUR_EXTRA_DIST}")
--- a/ncdap_test/expected4/CMakeLists.txt
+++ b/ncdap_test/expected4/CMakeLists.txt
@ -0,0 +1,10 @@
+SET(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+INCLUDE_DIRECTORIES(".")
+
+FILE(GLOB COPY_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*)
+FILE(COPY ${COPY_FILES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/ FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE)
+
+FILE(GLOB CUR_EXTRA_DIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*)
+SET(CUR_EXTRA_DIST ${CUR_EXTRA_DIST} CMakeLists.txt Makefile.am)
+ADD_EXTRA_DIST("${CUR_EXTRA_DIST}")
--- a/ncdap_test/expectremote3/CMakeLists.txt
+++ b/ncdap_test/expectremote3/CMakeLists.txt
@ -0,0 +1,10 @@
+SET(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+INCLUDE_DIRECTORIES(".")
+
+FILE(GLOB COPY_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*)
+FILE(COPY ${COPY_FILES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/ FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE)
+
+FILE(GLOB CUR_EXTRA_DIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*)
+SET(CUR_EXTRA_DIST ${CUR_EXTRA_DIST} CMakeLists.txt Makefile.am)
+ADD_EXTRA_DIST("${CUR_EXTRA_DIST}")
--- a/ncdap_test/expectremote4/CMakeLists.txt
+++ b/ncdap_test/expectremote4/CMakeLists.txt
@ -0,0 +1,10 @@
+SET(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+INCLUDE_DIRECTORIES(".")
+
+FILE(GLOB COPY_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*)
+FILE(COPY ${COPY_FILES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/ FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE)
+
+FILE(GLOB CUR_EXTRA_DIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*)
+SET(CUR_EXTRA_DIST ${CUR_EXTRA_DIST} CMakeLists.txt Makefile.am)
+ADD_EXTRA_DIST("${CUR_EXTRA_DIST}")
--- a/ncdap_test/expecttds3/CMakeLists.txt
+++ b/ncdap_test/expecttds3/CMakeLists.txt
@ -0,0 +1,10 @@
+SET(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+INCLUDE_DIRECTORIES(".")
+
+FILE(GLOB COPY_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*)
+FILE(COPY ${COPY_FILES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/ FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE)
+
+FILE(GLOB CUR_EXTRA_DIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*)
+SET(CUR_EXTRA_DIST ${CUR_EXTRA_DIST} CMakeLists.txt Makefile.am)
+ADD_EXTRA_DIST("${CUR_EXTRA_DIST}")
--- a/ncdap_test/nocacheremote3/CMakeLists.txt
+++ b/ncdap_test/nocacheremote3/CMakeLists.txt
@ -0,0 +1,10 @@
+SET(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+INCLUDE_DIRECTORIES(".")
+
+FILE(GLOB COPY_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*)
+FILE(COPY ${COPY_FILES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/ FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE)
+
+FILE(GLOB CUR_EXTRA_DIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*)
+SET(CUR_EXTRA_DIST ${CUR_EXTRA_DIST} CMakeLists.txt Makefile.am)
+ADD_EXTRA_DIST("${CUR_EXTRA_DIST}")
--- a/ncdap_test/nocacheremote4/CMakeLists.txt
+++ b/ncdap_test/nocacheremote4/CMakeLists.txt
@ -0,0 +1,10 @@
+SET(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+INCLUDE_DIRECTORIES(".")
+
+FILE(GLOB COPY_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*)
+FILE(COPY ${COPY_FILES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/ FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE)
+
+FILE(GLOB CUR_EXTRA_DIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*)
+SET(CUR_EXTRA_DIST ${CUR_EXTRA_DIST} CMakeLists.txt Makefile.am)
+ADD_EXTRA_DIST("${CUR_EXTRA_DIST}")
--- a/ncdap_test/special3/CMakeLists.txt
+++ b/ncdap_test/special3/CMakeLists.txt
@ -0,0 +1,10 @@
+SET(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+INCLUDE_DIRECTORIES(".")
+
+FILE(GLOB COPY_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*)
+FILE(COPY ${COPY_FILES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/ FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE)
+
+FILE(GLOB CUR_EXTRA_DIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*)
+SET(CUR_EXTRA_DIST ${CUR_EXTRA_DIST} CMakeLists.txt)
+ADD_EXTRA_DIST("${CUR_EXTRA_DIST}")
--- a/ncdap_test/testdata3/CMakeLists.txt
+++ b/ncdap_test/testdata3/CMakeLists.txt
@ -0,0 +1,10 @@
+SET(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+INCLUDE_DIRECTORIES(".")
+
+FILE(GLOB COPY_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*)
+FILE(COPY ${COPY_FILES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/ FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE)
+
+FILE(GLOB CUR_EXTRA_DIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*)
+SET(CUR_EXTRA_DIST ${CUR_EXTRA_DIST} CMakeLists.txt Makefile.am)
+ADD_EXTRA_DIST("${CUR_EXTRA_DIST}")
--- a/ncdump/CMakeLists.txt
+++ b/ncdump/CMakeLists.txt
@ -7,8 +7,7 @@ IF(BUILD_SHARED_LIBS AND WIN32)
 	remove_definitions(-DDLL_NETCDF)
 ENDIF()

-FILE(GLOB COPY_FILES ${CMAKE_BINARY_DIR}/ncgen/*.nc ${CMAKE_BINARY_DIR}/nc_test4/*.nc ${CMAKE_CURRENT_SOURCE_DIR}/*.ncml ${CMAKE_CURRENT_SOURCE_DIR}/*.nc ${CMAKE_CURRENT_SOURCE_DIR}/*.cdl ${CMAKE_CURRENT_SOURCE_DIR}/*.sh ${CMAKE_CURRENT_SOURCE_DIR}/cdl4 ${CMAKE_CURRENT_SOURCE_DIR}/expected4 )
-FILE(COPY ${COPY_FILES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/ FILE_PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE)
+

 #IF(EXTRA_TESTS)
 ADD_CUSTOM_COMMAND(
@ -37,8 +36,6 @@ ADD_EXECUTABLE(nccopy ${nccopy_FILES})
 TARGET_LINK_LIBRARIES(ncdump netcdf ${ALL_TLL_LIBS})
 TARGET_LINK_LIBRARIES(nccopy netcdf ${ALL_TLL_LIBS})

-
-
 IF(ENABLE_TESTS)
 	ADD_EXECUTABLE(rewrite-scalar rewrite-scalar.c)
 	TARGET_LINK_LIBRARIES(rewrite-scalar netcdf)
@ -136,11 +133,26 @@ ENDIF()
 INSTALL(TARGETS ncdump DESTINATION bin COMPONENT utilities)
 INSTALL(TARGETS nccopy DESTINATION bin COMPONENT utilities)
 SET(MAN_FILES nccopy.1 ncdump.1)
-IF(NOT MSVC)	
-	INSTALL(FILES ${MAN_FILES} DESTINATION "share/man/man1" COMPONENT documentation)
-ENDIF()
+
+
+FILE(GLOB COPY_FILES ${CMAKE_BINARY_DIR}/ncgen/*.nc ${CMAKE_BINARY_DIR}/nc_test4/*.nc ${CMAKE_CURRENT_SOURCE_DIR}/*.ncml ${CMAKE_CURRENT_SOURCE_DIR}/*.nc ${CMAKE_CURRENT_SOURCE_DIR}/*.cdl ${CMAKE_CURRENT_SOURCE_DIR}/*.sh ${CMAKE_CURRENT_SOURCE_DIR}/*.1) 
+FILE(COPY ${COPY_FILES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/ FILE_PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE)
+
+ADD_SUBDIRECTORY(cdl4)
+ADD_SUBDIRECTORY(expected4)
+
+## Specify files to be distributed by 'make dist'
+FILE(GLOB CUR_EXTRA_DIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*.c ${CMAKE_CURRENT_SOURCE_DIR}/*.h ${CMAKE_CURRENT_SOURCE_DIR}/*.sh)
+SET(CUR_EXTRA_DIST ${CUR_EXTRA_DIST} test0.cdl ref_ctest1_nc4.cdl ref_ctest1_nc4c.cdl ref_tst_solar_1.cdl ref_tst_solar_2.cdl ref_tst_small.cdl tst_ncml.cdl ref1.ncml ref_tst_group_data.cdl ref_tst_enum_data.cdl ref_tst_opaque_data.cdl ref_tst_string_data.cdl ref_tst_vlen_data.cdl ref_tst_comp.cdl ref_tst_unicode.cdl ref_tst_nans.cdl small.cdl small2.cdl ref_tst_utf8.cdl ref_tst_fillbug.cdl tst_calendars.cdl ref_times.cdl ref_tst_special_atts.cdl ref_tst_noncoord.cdl ref_tst_compounds2.nc ref_tst_compounds2.cdl ref_tst_compounds3.nc ref_tst_compounds3.cdl ref_tst_compounds4.nc ref_tst_compounds4.cdl ref_tst_group_data_v23.cdl tst_mslp.cdl ref_tst_format_att.cdl ref_tst_format_att_64.cdl ref_nc_test_netcdf4_4_0.nc ref_nc_test_netcdf4.cdl ref_tst_special_atts3.cdl tst_brecs.cdl ref_tst_grp_spec0.cdl ref_tst_grp_spec.cdl ref_tst_grp_spec0.cdl ref_tst_grp_spec.cdl ref_tst_charfill.cdl tst_charfill.cdl ref_tst_mud4.cdl ref_tst_ncf213.cdl CMakeLists.txt Makefile.am XGetopt.c nccopy.1 ncdump.1) 
+ADD_EXTRA_DIST("${CUR_EXTRA_DIST}")
+
+

 SET(CLEANFILES test0.nc test1.cdl test1.nc test2.cdl ctest1.cdl ctest.c ctest64.c ctest0.nc  ctest0_64.nc c1.cdl ctest1_64.cdl c0.nc small.nc small2.nc c0tmp.nc c1.ncml utf8.cdl utf8_64.cdl utf8.nc utf8_64.nc tmp.cdl tst_vlen_data.nc tst_utf8.nc tst_special_atts.nc tst_unicode.nc tst_solar_2.nc tst_string_data.nc tst_calendars.nc tst_nans.nc tst_opaque_data.nc tst_solar_cmp.nc tst_enum_data.nc tst_solar_1.nc tst_mslp_64.nc tst_mslp.nc tst_comp2.nc tst_ncml.nc tst_fillbug.nc tst_group_data.nc tst_small.nc tst_comp.nc tst_unicode.cdl tst_group_data.cdl tst_compounds2.cdl tst_comp.cdl tst_enum_data.cdl tst_small.cdl tst_times.cdl tst_solar_2.cdl tst_string_data.cdl tst_fillbug.cdl tst_opaque_data.cdl tst_compounds4.cdl tst_utf8.cdl tst_compounds3.cdl tst_special_atts.cdl tst_nans.cdl tst_format_att_64.cdl tst_vlen_data.cdl tst_solar_1.cdl tst_format_att.cdl tst_inflated.nc tmp_subset.cdl tst_inflated4.nc tst_deflated.nc tst_chunking.nc tmp*.nc tst_charfill.nc tmp_tst_charfill.cdl iter.* tst_nc_test_netcdf4_4_0.cdl)

 SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${CLEANFILES}")

+IF(NOT MSVC)	
+	INSTALL(FILES ${MAN_FILES} DESTINATION "share/man/man1" COMPONENT documentation)
+ENDIF()
+
--- a/ncdump/cdl4/CMakeLists.txt
+++ b/ncdump/cdl4/CMakeLists.txt
@ -0,0 +1,10 @@
+SET(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+INCLUDE_DIRECTORIES(".")
+
+FILE(GLOB COPY_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*)
+FILE(COPY ${COPY_FILES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/ FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE)
+
+FILE(GLOB CUR_EXTRA_DIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*.cdl)
+SET(CUR_EXTRA_DIST ${CUR_EXTRA_DIST} CMakeLists.txt Makefile.am)
+ADD_EXTRA_DIST("${CUR_EXTRA_DIST}")
--- a/ncdump/expected4/CMakeLists.txt
+++ b/ncdump/expected4/CMakeLists.txt
@ -0,0 +1,10 @@
+SET(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+INCLUDE_DIRECTORIES(".")
+
+FILE(GLOB COPY_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*)
+FILE(COPY ${COPY_FILES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/ FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE)
+
+FILE(GLOB CUR_EXTRA_DIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*.dmp)
+SET(CUR_EXTRA_DIST ${CUR_EXTRA_DIST} CMakeLists.txt Makefile.am)
+ADD_EXTRA_DIST("${CUR_EXTRA_DIST}")
--- a/ncgen/CMakeLists.txt
+++ b/ncgen/CMakeLists.txt
@ -50,3 +50,7 @@ ADD_CUSTOM_COMMAND(

 ADD_CUSTOM_TARGET(makeparser DEPENDS ncgentab.h)

+## Specify files to be distributed by 'make dist'
+FILE(GLOB CUR_EXTRA_DIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*.c ${CMAKE_CURRENT_SOURCE_DIR}/*.h ${CMAKE_CURRENT_SOURCE_DIR}/*.sh)
+SET(CUR_EXTRA_DIST ${CUR_EXTRA_DIST} ncgen.y ncgenyy.c ncgen.l internals.html c0.cdl ref_camrun.cdl ncf199.cdl CMakeLists.txt Makefile.am ncgen.1)
+ADD_EXTRA_DIST("${CUR_EXTRA_DIST}")
--- a/ncgen3/CMakeLists.txt
+++ b/ncgen3/CMakeLists.txt
@ -43,6 +43,12 @@ IF(NOT MSVC)
 	INSTALL(FILES ${MAN_FILES} DESTINATION "share/man/man1" COMPONENT documentation)
 ENDIF()

+## Specify files to be distributed by 'make dist'
+FILE(GLOB CUR_EXTRA_DIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*.c ${CMAKE_CURRENT_SOURCE_DIR}/*.h ${CMAKE_CURRENT_SOURCE_DIR}/*.sh)
+SET(CUR_EXTRA_DIST ${CUR_EXTRA_DIST} CMakeLists.txt XGetopt.c Makefile.am ncgen.y ncgenyy.c ncgen.l c0.cdl ncgen3.1)
+ADD_EXTRA_DIST("${CUR_EXTRA_DIST}")
+
+
 SET(CLEANFILES c0.nc c0_64.nc c0_4.nc c0_4c.nc) 
 SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${CLEANFILES}")

--- a/nctest/CMakeLists.txt
+++ b/nctest/CMakeLists.txt
@ -14,10 +14,11 @@ ADD_EXECUTABLE(tst_rename tst_rename.c)
 TARGET_LINK_LIBRARIES(nctest netcdf)
 TARGET_LINK_LIBRARIES(tst_rename netcdf)

-#INSTALL(TARGETS nctest DESTINATION bin)
-#INSTALL(TARGETS tst_rename DESTINATION bin)
-## Tests
-#ADD_TEST(run_tests.sh ${CMAKE_SOURCE_PATH}/run_tests.sh)
-
 ADD_TEST(nctest ${EXECUTABLE_OUTPUT_PATH}/nctest)
 ADD_TEST(tst_rename ${EXECUTABLE_OUTPUT_PATH}/tst_rename)
+
+## Specify files to be distributed by 'make dist'
+FILE(GLOB CUR_EXTRA_DIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*.c ${CMAKE_CURRENT_SOURCE_DIR}/*.h ${CMAKE_CURRENT_SOURCE_DIR}/*.sh)
+SET(CUR_EXTRA_DIST ${CUR_EXTRA_DIST} CMakeLists.txt Makefile.am)
+SET(CUR_EXTRA_DIST ${CUR_EXTRA_DIST} ref_nctest_classic.nc ref_nctest_64bit_offset.nc)
+ADD_EXTRA_DIST("${CUR_EXTRA_DIST}")
--- a/oc2/CMakeLists.txt
+++ b/oc2/CMakeLists.txt
@ -4,7 +4,12 @@ INCLUDE_DIRECTORIES(".")

 SET(oc_SOURCES oc.c daplex.c dapparse.c daptab.c occlientparams.c occompile.c occurlfunctions.c ocdata.c ocdebug.c ocdump.c ocinternal.c ocnode.c ochttp.c ocrc.c ocread.c ocutil.c ocbytes.c oclist.c ocuri.c oclog.c xxdr.c)

+
 add_library(oc2 OBJECT ${oc_SOURCES}) 


-
+## Specify files to be distributed by 'make dist'
+FILE(GLOB CUR_EXTRA_DIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*.c ${CMAKE_CURRENT_SOURCE_DIR}/*.h ${CMAKE_CURRENT_SOURCE_DIR}/*.sh)
+SET(CUR_EXTRA_DIST ${CUR_EXTRA_DIST} CMakeLists.txt Makefile.am)
+SET(CUR_EXTRA_DIST ${CUR_EXTRA_DIST} dap.y)
+ADD_EXTRA_DIST("${CUR_EXTRA_DIST}")