merged master

This commit is contained in:
edwardhartnett 2019-08-21 15:01:46 -06:00
commit 2fcf184e35

View File

@ -1005,15 +1005,9 @@ IF(ENABLE_PARALLEL4 AND ENABLE_NETCDF_4)
SET(STATUS_PARALLEL "ON")
configure_file("${netCDF_SOURCE_DIR}/nc_test4/run_par_test.sh.in"
"${netCDF_BINARY_DIR}/tmp/run_par_test.sh" @ONLY NEWLINE_STYLE LF)
#configure_file("${netCDF_SOURCE_DIR}/nc_test4/run_par_test2.sh.in"
# "${netCDF_BINARY_DIR}/tmp/run_par_test2.sh" @ONLY NEWLINE_STYLE LF)
FILE(COPY "${netCDF_BINARY_DIR}/tmp/run_par_test.sh"
DESTINATION ${netCDF_BINARY_DIR}/nc_test4
FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
#FILE(COPY "${netCDF_BINARY_DIR}/tmp/run_par_test2.sh"
# DESTINATION ${netCDF_BINARY_DIR}/nc_test4
# FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
ENDIF()
ENDIF()