From 392410eae3e8112f4db7a382bf28d1d0754719c7 Mon Sep 17 00:00:00 2001 From: Edward Hartnett Date: Thu, 14 May 2020 10:55:09 -0600 Subject: [PATCH 1/9] added first version of CMakeLists.txt --- CMakeLists.txt | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 0000000000..cc41d4b980 --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,33 @@ +# This is the main cmake file for ufs-srweather-app. +# +# Ed Hartnett 5/14/20 + +# This will use any cmake between 3.1 and 3.15, prefering later +# versions with updated policies. +cmake_minimum_required(VERSION 3.1...3.15) +if (${CMAKE_VERSION} VERSION_LESS 3.12) + cmake_policy(VERSION ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}) +endif() + +# set the project name +project(ufs-srweather-app VERSION 1.0) + +#Add custom CMake Module +SET(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/" + CACHE INTERNAL "Location of our custom CMake modules.") + +# Find netCDF. +#include(FindNetCDF) +#find_package (NetCDF REQUIRED) + +#include_directories("${NETCDF_INCLUDES}") + +# Create a config.h. +#configure_file(config.h.cmake.in config.h) + +# Turn on testing. +enable_testing() +include(CTest) + +# Build in this subdirectory. +add_subdirectory(src) From 705c76fe40ddabddc3b29fd49e9772565aff8070 Mon Sep 17 00:00:00 2001 From: Edward Hartnett Date: Fri, 15 May 2020 04:37:34 -0600 Subject: [PATCH 2/9] first round of ufs-srweather-app.settings --- CMakeLists.txt | 100 +++++++++++++++++++++++++++++++++- ufs-srweather-app.settings.in | 45 +++++++++++++++ 2 files changed, 144 insertions(+), 1 deletion(-) create mode 100644 ufs-srweather-app.settings.in diff --git a/CMakeLists.txt b/CMakeLists.txt index cc41d4b980..ddddc936c5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,6 +16,37 @@ project(ufs-srweather-app VERSION 1.0) SET(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/" CACHE INTERNAL "Location of our custom CMake modules.") +# A function used to create autotools-style 'yes/no' definitions. +# If a variable is set, it 'yes' is returned. Otherwise, 'no' is +# returned. +# +# Also creates a version of the ret_val prepended with 'NC', +# when feature is true, which is used to generate netcdf_meta.h. +FUNCTION(is_disabled feature ret_val) + IF(${feature}) + SET(${ret_val} "no" PARENT_SCOPE) + ELSE() + SET(${ret_val} "yes" PARENT_SCOPE) + SET("NC_${ret_val}" 1 PARENT_SCOPE) + ENDIF(${feature}) +ENDFUNCTION() + +# A function used to create autotools-style 'yes/no' definitions. +# If a variable is set, it 'yes' is returned. Otherwise, 'no' is +# returned. +# +# Also creates a version of the ret_val prepended with 'NC', +# when feature is true, which is used to generate netcdf_meta.h. +FUNCTION(is_enabled feature ret_val) + IF(${feature}) + SET(${ret_val} "yes" PARENT_SCOPE) + SET("NC_${ret_val}" 1 PARENT_SCOPE) + ELSE() + SET(${ret_val} "no" PARENT_SCOPE) + SET("NC_${ret_val}" 0 PARENT_SCOPE) + ENDIF(${feature}) +ENDFUNCTION() + # Find netCDF. #include(FindNetCDF) #find_package (NetCDF REQUIRED) @@ -30,4 +61,71 @@ enable_testing() include(CTest) # Build in this subdirectory. -add_subdirectory(src) +#add_subdirectory(src) + +##### +# Configure and print the ufs-srweather-app.settings file. +##### + +# Set variables to mirror those used by autoconf. +# This way we don't need to maintain two separate template +# files. +SET(host_cpu "${cpu}") +SET(host_vendor "${osname}") +SET(host_os "${osrel}") +SET(abs_top_builddir "${CMAKE_CURRENT_BINARY_DIR}") +SET(abs_top_srcdir "${CMAKE_CURRENT_SOURCE_DIR}") + +SET(CC_VERSION "${CMAKE_C_COMPILER}") + +# Build *FLAGS for ufs-srweather-app.settings. +SET(CFLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE}}") +SET(CPPFLAGS "${CMAKE_CPP_FLAGS} ${CMAKE_CPP_FLAGS_${CMAKE_BUILD_TYPE}}") +SET(LDFLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${CMAKE_SHARED_LINKER_FLAGS_${CMAKE_BUILD_TYPE}}") + +is_disabled(BUILD_SHARED_LIBS enable_static) +is_enabled(BUILD_SHARED_LIBS enable_shared) + +is_enabled(ENABLE_V2_API HAS_NC2) +is_enabled(ENABLE_NETCDF_4 HAS_NC4) +is_enabled(ENABLE_HDF4 HAS_HDF4) +is_enabled(ENABLE_NETCDF_4 HAS_HDF5) +is_enabled(USE_SZIP HAS_SZLIB) +is_enabled(USE_SZIP HAS_SZLIB_WRITE) +is_enabled(STATUS_PNETCDF HAS_PNETCDF) +is_enabled(STATUS_PARALLEL HAS_PARALLEL) +is_enabled(ENABLE_PARALLEL4 HAS_PARALLEL4) +is_enabled(ENABLE_DAP HAS_DAP) +is_enabled(ENABLE_DAP HAS_DAP2) +is_enabled(ENABLE_DAP4 HAS_DAP4) +is_enabled(ENABLE_BYTERANGE HAS_BYTERANGE) +is_enabled(ENABLE_DISKLESS HAS_DISKLESS) +is_enabled(USE_MMAP HAS_MMAP) +is_enabled(JNA HAS_JNA) +is_enabled(ENABLE_ZERO_LENGTH_COORD_BOUND RELAX_COORD_BOUND) +is_enabled(USE_CDF5 HAS_CDF5) +is_enabled(ENABLE_ERANGE_FILL HAS_ERANGE_FILL) +is_enabled(HAVE_H5Z_SZIP HAS_SZLIB) +is_enabled(HDF5_HAS_PAR_FILTERS HAS_PAR_FILTERS) + +# Generate file from template. +CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/ufs-srweather-app.settings.in" + "${CMAKE_CURRENT_BINARY_DIR}/ufs-srweather-app.settings" + @ONLY) + +# Read in settings file, print out. +# Avoid using system-specific calls so that this +# might also work on Windows. +FILE(READ "${CMAKE_CURRENT_BINARY_DIR}/ufs-srweather-app.settings" + UFS-SRWEATHER-APP_SETTINGS) +MESSAGE(${UFS-SRWEATHER-APP_SETTINGS}) + +# Install ufs-srweather-app.settings file into same location +# as the libraries. +INSTALL(FILES "${netCDF_BINARY_DIR}/ufs-srweather-app.settings" + DESTINATION include + COMPONENT libraries) + +##### +# End ufs-srweather-app.settings section. +##### diff --git a/ufs-srweather-app.settings.in b/ufs-srweather-app.settings.in new file mode 100644 index 0000000000..94b5a13640 --- /dev/null +++ b/ufs-srweather-app.settings.in @@ -0,0 +1,45 @@ +# NetCDF C Configuration Summary +============================== + +# General +------- +NetCDF Version: @PACKAGE_VERSION@ +Dispatch Version: @NC_DISPATCH_VERSION@ +Configured On: @CONFIG_DATE@ +Host System: @host_cpu@-@host_vendor@-@host_os@ +Build Directory: @abs_top_builddir@ +Install Prefix: @prefix@ + +# Compiling Options +----------------- +C Compiler: @CC_VERSION@ +CFLAGS: @CFLAGS@ +CPPFLAGS: @CPPFLAGS@ +LDFLAGS: @LDFLAGS@ +AM_CFLAGS: @AM_CFLAGS@ +AM_CPPFLAGS: @AM_CPPFLAGS@ +AM_LDFLAGS: @AM_LDFLAGS@ +Shared Library: @enable_shared@ +Static Library: @enable_static@ +Extra libraries: @LIBS@ + +# Features +-------- +NetCDF-2 API: @HAS_NC2@ +HDF4 Support: @HAS_HDF4@ +HDF5 Support: @HAS_HDF5@ +NetCDF-4 API: @HAS_NC4@ +NC-4 Parallel Support: @HAS_PARALLEL4@ +PnetCDF Support: @HAS_PNETCDF@ +DAP2 Support: @HAS_DAP@ +DAP4 Support: @HAS_DAP4@ +Byte-Range Support: @HAS_BYTERANGE@ +Diskless Support: @HAS_DISKLESS@ +MMap Support: @HAS_MMAP@ +JNA Support: @HAS_JNA@ +CDF5 Support: @HAS_CDF5@ +ERANGE Fill Support: @HAS_ERANGE_FILL@ +Relaxed Boundary Check: @RELAX_COORD_BOUND@ +SZIP Support: @HAS_SZLIB@ +SZIP Write Support: @HAS_SZLIB_WRITE@ +Parallel Filters: @HAS_PAR_FILTERS@ From 9e11aa3a3b8a69ef6c152f394cb8e6b4a8f907a2 Mon Sep 17 00:00:00 2001 From: Edward Hartnett Date: Fri, 15 May 2020 04:54:16 -0600 Subject: [PATCH 3/9] added ufs_srweather_app_meta.h --- CMakeLists.txt | 23 ++++++++++++++++++----- ufs-srweather-app.settings.in | 18 +----------------- ufs_srweather_app_meta.h.in | 25 +++++++++++++++++++++++++ 3 files changed, 44 insertions(+), 22 deletions(-) create mode 100644 ufs_srweather_app_meta.h.in diff --git a/CMakeLists.txt b/CMakeLists.txt index ddddc936c5..4ebb3cd066 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,9 +9,16 @@ if (${CMAKE_VERSION} VERSION_LESS 3.12) cmake_policy(VERSION ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}) endif() -# set the project name +# Set the project name and version. project(ufs-srweather-app VERSION 1.0) +# Set extended version info. +SET(SRWA_VERSION_MAJOR 1) +SET(SRWA_VERSION_MINOR 0) +SET(SRWA_VERSION_PATCH 0) +SET(SRWA_VERSION_NOTE "-development") +SET(SRWA_VERSION ${SRWA_VERSION_MAJOR}.${SRWA_VERSION_MINOR}.${SRWA_VERSION_PATCH}${SRWA_VERSION_NOTE}) + #Add custom CMake Module SET(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/" CACHE INTERNAL "Location of our custom CMake modules.") @@ -27,7 +34,7 @@ FUNCTION(is_disabled feature ret_val) SET(${ret_val} "no" PARENT_SCOPE) ELSE() SET(${ret_val} "yes" PARENT_SCOPE) - SET("NC_${ret_val}" 1 PARENT_SCOPE) + SET("SRWA_${ret_val}" 1 PARENT_SCOPE) ENDIF(${feature}) ENDFUNCTION() @@ -40,10 +47,10 @@ ENDFUNCTION() FUNCTION(is_enabled feature ret_val) IF(${feature}) SET(${ret_val} "yes" PARENT_SCOPE) - SET("NC_${ret_val}" 1 PARENT_SCOPE) + SET("SRWA_${ret_val}" 1 PARENT_SCOPE) ELSE() SET(${ret_val} "no" PARENT_SCOPE) - SET("NC_${ret_val}" 0 PARENT_SCOPE) + SET("SRWA_${ret_val}" 0 PARENT_SCOPE) ENDIF(${feature}) ENDFUNCTION() @@ -127,5 +134,11 @@ INSTALL(FILES "${netCDF_BINARY_DIR}/ufs-srweather-app.settings" COMPONENT libraries) ##### -# End ufs-srweather-app.settings section. +# Create 'ufs_srweather_app_meta.h' include file. ##### +configure_file( + ufs_srweather_app_meta.h.in + ufs_srweather_app_meta.h @ONLY) + +FILE(COPY "${CMAKE_CURRENT_BINARY_DIR}/ufs_srweather_app_meta.h" DESTINATION include) + diff --git a/ufs-srweather-app.settings.in b/ufs-srweather-app.settings.in index 94b5a13640..fb2535cf6f 100644 --- a/ufs-srweather-app.settings.in +++ b/ufs-srweather-app.settings.in @@ -25,21 +25,5 @@ Extra libraries: @LIBS@ # Features -------- -NetCDF-2 API: @HAS_NC2@ -HDF4 Support: @HAS_HDF4@ -HDF5 Support: @HAS_HDF5@ -NetCDF-4 API: @HAS_NC4@ NC-4 Parallel Support: @HAS_PARALLEL4@ -PnetCDF Support: @HAS_PNETCDF@ -DAP2 Support: @HAS_DAP@ -DAP4 Support: @HAS_DAP4@ -Byte-Range Support: @HAS_BYTERANGE@ -Diskless Support: @HAS_DISKLESS@ -MMap Support: @HAS_MMAP@ -JNA Support: @HAS_JNA@ -CDF5 Support: @HAS_CDF5@ -ERANGE Fill Support: @HAS_ERANGE_FILL@ -Relaxed Boundary Check: @RELAX_COORD_BOUND@ -SZIP Support: @HAS_SZLIB@ -SZIP Write Support: @HAS_SZLIB_WRITE@ -Parallel Filters: @HAS_PAR_FILTERS@ + diff --git a/ufs_srweather_app_meta.h.in b/ufs_srweather_app_meta.h.in new file mode 100644 index 0000000000..b106d7dd45 --- /dev/null +++ b/ufs_srweather_app_meta.h.in @@ -0,0 +1,25 @@ +/* + * Meta information for ufs-srweather-app which can be used by other + * packages. + * + * This file is automatically generated by the build system + * at configure time, and contains information related to + * how ufs-srweather-app was built. It will not be required to + * include this file unless you want to probe the capabilities + * of the build. + * + * Ed Hartnett, 5/15/20 + */ + +#ifndef UFS_SRWEATHER_APP_META_H +#define UFS_SRWEATHER_APP_META_H + +#define SRWA_VERSION_MAJOR @SRWA_VERSION_MAJOR@ +#define SRWA_VERSION_MINOR @SRWA_VERSION_MINOR@ +#define SRWA_VERSION_PATCH @SRWA_VERSION_PATCH@ +#define SRWA_VERSION_NOTE "@SRWA_VERSION_NOTE@" + +#define SRWA_VERSION "@SRWA_VERSION@" + +#define SRWA_HAS_PARALLEL @SRWA_HAS_PARALLEL@ +#endif From 2972584f4f1fce4c40e0fd5c8ddcc9d66fef74d0 Mon Sep 17 00:00:00 2001 From: Edward Hartnett Date: Fri, 15 May 2020 05:06:42 -0600 Subject: [PATCH 4/9] cleaned up --- CMakeLists.txt | 39 ++++----------------------------------- 1 file changed, 4 insertions(+), 35 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4ebb3cd066..da5260773b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,7 +28,7 @@ SET(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/" # returned. # # Also creates a version of the ret_val prepended with 'NC', -# when feature is true, which is used to generate netcdf_meta.h. +# when feature is true, which is used to generate ufs_srweather_app_meta.h. FUNCTION(is_disabled feature ret_val) IF(${feature}) SET(${ret_val} "no" PARENT_SCOPE) @@ -43,7 +43,7 @@ ENDFUNCTION() # returned. # # Also creates a version of the ret_val prepended with 'NC', -# when feature is true, which is used to generate netcdf_meta.h. +# when feature is true, which is used to generate ufs_srweather_app_meta.h. FUNCTION(is_enabled feature ret_val) IF(${feature}) SET(${ret_val} "yes" PARENT_SCOPE) @@ -54,15 +54,6 @@ FUNCTION(is_enabled feature ret_val) ENDIF(${feature}) ENDFUNCTION() -# Find netCDF. -#include(FindNetCDF) -#find_package (NetCDF REQUIRED) - -#include_directories("${NETCDF_INCLUDES}") - -# Create a config.h. -#configure_file(config.h.cmake.in config.h) - # Turn on testing. enable_testing() include(CTest) @@ -74,9 +65,7 @@ include(CTest) # Configure and print the ufs-srweather-app.settings file. ##### -# Set variables to mirror those used by autoconf. -# This way we don't need to maintain two separate template -# files. +# Set variables. SET(host_cpu "${cpu}") SET(host_vendor "${osname}") SET(host_os "${osrel}") @@ -90,30 +79,10 @@ SET(CFLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE}}") SET(CPPFLAGS "${CMAKE_CPP_FLAGS} ${CMAKE_CPP_FLAGS_${CMAKE_BUILD_TYPE}}") SET(LDFLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${CMAKE_SHARED_LINKER_FLAGS_${CMAKE_BUILD_TYPE}}") +# Determine output yes/no values. is_disabled(BUILD_SHARED_LIBS enable_static) is_enabled(BUILD_SHARED_LIBS enable_shared) - -is_enabled(ENABLE_V2_API HAS_NC2) -is_enabled(ENABLE_NETCDF_4 HAS_NC4) -is_enabled(ENABLE_HDF4 HAS_HDF4) -is_enabled(ENABLE_NETCDF_4 HAS_HDF5) -is_enabled(USE_SZIP HAS_SZLIB) -is_enabled(USE_SZIP HAS_SZLIB_WRITE) -is_enabled(STATUS_PNETCDF HAS_PNETCDF) is_enabled(STATUS_PARALLEL HAS_PARALLEL) -is_enabled(ENABLE_PARALLEL4 HAS_PARALLEL4) -is_enabled(ENABLE_DAP HAS_DAP) -is_enabled(ENABLE_DAP HAS_DAP2) -is_enabled(ENABLE_DAP4 HAS_DAP4) -is_enabled(ENABLE_BYTERANGE HAS_BYTERANGE) -is_enabled(ENABLE_DISKLESS HAS_DISKLESS) -is_enabled(USE_MMAP HAS_MMAP) -is_enabled(JNA HAS_JNA) -is_enabled(ENABLE_ZERO_LENGTH_COORD_BOUND RELAX_COORD_BOUND) -is_enabled(USE_CDF5 HAS_CDF5) -is_enabled(ENABLE_ERANGE_FILL HAS_ERANGE_FILL) -is_enabled(HAVE_H5Z_SZIP HAS_SZLIB) -is_enabled(HDF5_HAS_PAR_FILTERS HAS_PAR_FILTERS) # Generate file from template. CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/ufs-srweather-app.settings.in" From dde4449ff6098580845d456330b2343e3bf3e34a Mon Sep 17 00:00:00 2001 From: Edward Hartnett Date: Fri, 15 May 2020 05:13:02 -0600 Subject: [PATCH 5/9] renamed file --- CMakeLists.txt | 15 +++++++-------- ...p.settings.in => ufs_srweather_app.settings.in | 0 2 files changed, 7 insertions(+), 8 deletions(-) rename ufs-srweather-app.settings.in => ufs_srweather_app.settings.in (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index da5260773b..7b04045e9b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -85,22 +85,21 @@ is_enabled(BUILD_SHARED_LIBS enable_shared) is_enabled(STATUS_PARALLEL HAS_PARALLEL) # Generate file from template. -CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/ufs-srweather-app.settings.in" - "${CMAKE_CURRENT_BINARY_DIR}/ufs-srweather-app.settings" +CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/ufs_srweather_app.settings.in" + "${CMAKE_CURRENT_BINARY_DIR}/ufs_srweather_app.settings" @ONLY) # Read in settings file, print out. # Avoid using system-specific calls so that this # might also work on Windows. -FILE(READ "${CMAKE_CURRENT_BINARY_DIR}/ufs-srweather-app.settings" +FILE(READ "${CMAKE_CURRENT_BINARY_DIR}/ufs_srweather_app.settings" UFS-SRWEATHER-APP_SETTINGS) MESSAGE(${UFS-SRWEATHER-APP_SETTINGS}) -# Install ufs-srweather-app.settings file into same location -# as the libraries. -INSTALL(FILES "${netCDF_BINARY_DIR}/ufs-srweather-app.settings" - DESTINATION include - COMPONENT libraries) +# Install ufs_srweather_app.settings file into same location +# as the app. +INSTALL(FILES "${CMAKE_BINARY_DIR}/ufs_srweather_app.settings" + DESTINATION bin) ##### # Create 'ufs_srweather_app_meta.h' include file. diff --git a/ufs-srweather-app.settings.in b/ufs_srweather_app.settings.in similarity index 100% rename from ufs-srweather-app.settings.in rename to ufs_srweather_app.settings.in From 38db35d046e4e10f66265f49beedbcf27c2cc1a0 Mon Sep 17 00:00:00 2001 From: Edward Hartnett Date: Fri, 15 May 2020 05:23:12 -0600 Subject: [PATCH 6/9] more development of settings --- CMakeLists.txt | 31 ++++++++++++++++++++++++++++++- ufs_srweather_app.settings.in | 14 +++++--------- 2 files changed, 35 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7b04045e9b..7e8457ce10 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -65,6 +65,34 @@ include(CTest) # Configure and print the ufs-srweather-app.settings file. ##### +# Determine the configure date. +IF(DEFINED ENV{SOURCE_DATE_EPOCH}) + EXECUTE_PROCESS( + COMMAND "date" "-u" "-d" "@$ENV{SOURCE_DATE_EPOCH}" + OUTPUT_VARIABLE CONFIG_DATE + ) +ELSE() + EXECUTE_PROCESS( + COMMAND date + OUTPUT_VARIABLE CONFIG_DATE + ) +ENDIF() +IF(CONFIG_DATE) + string(STRIP ${CONFIG_DATE} CONFIG_DATE) +ENDIF() + +# Get system configuration, Use it to determine osname, os release, cpu. These +# will be used when committing to CDash. +find_program(UNAME NAMES uname) +IF(UNAME) + macro(getuname name flag) + exec_program("${UNAME}" ARGS "${flag}" OUTPUT_VARIABLE "${name}") + endmacro(getuname) + getuname(osname -s) + getuname(osrel -r) + getuname(cpu -m) +ENDIF() + # Set variables. SET(host_cpu "${cpu}") SET(host_vendor "${osname}") @@ -74,10 +102,11 @@ SET(abs_top_srcdir "${CMAKE_CURRENT_SOURCE_DIR}") SET(CC_VERSION "${CMAKE_C_COMPILER}") -# Build *FLAGS for ufs-srweather-app.settings. +# Set values for .settings file. SET(CFLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE}}") SET(CPPFLAGS "${CMAKE_CPP_FLAGS} ${CMAKE_CPP_FLAGS_${CMAKE_BUILD_TYPE}}") SET(LDFLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${CMAKE_SHARED_LINKER_FLAGS_${CMAKE_BUILD_TYPE}}") +SET(prefix ${CMAKE_INSTALL_PREFIX}) # Determine output yes/no values. is_disabled(BUILD_SHARED_LIBS enable_static) diff --git a/ufs_srweather_app.settings.in b/ufs_srweather_app.settings.in index fb2535cf6f..f21b47a422 100644 --- a/ufs_srweather_app.settings.in +++ b/ufs_srweather_app.settings.in @@ -2,28 +2,24 @@ ============================== # General -------- -NetCDF Version: @PACKAGE_VERSION@ -Dispatch Version: @NC_DISPATCH_VERSION@ +--------- +Version: @SRWA_VERSION@ Configured On: @CONFIG_DATE@ Host System: @host_cpu@-@host_vendor@-@host_os@ Build Directory: @abs_top_builddir@ Install Prefix: @prefix@ # Compiling Options ------------------ +------------------- C Compiler: @CC_VERSION@ CFLAGS: @CFLAGS@ CPPFLAGS: @CPPFLAGS@ LDFLAGS: @LDFLAGS@ -AM_CFLAGS: @AM_CFLAGS@ -AM_CPPFLAGS: @AM_CPPFLAGS@ -AM_LDFLAGS: @AM_LDFLAGS@ Shared Library: @enable_shared@ Static Library: @enable_static@ Extra libraries: @LIBS@ # Features --------- -NC-4 Parallel Support: @HAS_PARALLEL4@ +---------- +Parallel Support: @HAS_PARALLEL@ From d8e5c84fe134318640cbd55aea28d12f341362d5 Mon Sep 17 00:00:00 2001 From: Edward Hartnett Date: Fri, 15 May 2020 05:23:49 -0600 Subject: [PATCH 7/9] more development of settings --- ufs_srweather_app.settings.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ufs_srweather_app.settings.in b/ufs_srweather_app.settings.in index f21b47a422..0301048bff 100644 --- a/ufs_srweather_app.settings.in +++ b/ufs_srweather_app.settings.in @@ -3,7 +3,7 @@ # General --------- -Version: @SRWA_VERSION@ +SRWA Version: @SRWA_VERSION@ Configured On: @CONFIG_DATE@ Host System: @host_cpu@-@host_vendor@-@host_os@ Build Directory: @abs_top_builddir@ From 7ddcdfaeb3d5ed9650477a715231126dfd83c6a5 Mon Sep 17 00:00:00 2001 From: Edward Hartnett Date: Fri, 15 May 2020 05:28:12 -0600 Subject: [PATCH 8/9] more development of settings --- ufs_srweather_app.settings.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ufs_srweather_app.settings.in b/ufs_srweather_app.settings.in index 0301048bff..0aeba1cd6c 100644 --- a/ufs_srweather_app.settings.in +++ b/ufs_srweather_app.settings.in @@ -1,5 +1,5 @@ -# NetCDF C Configuration Summary -============================== +# UFS Short Range Weather App Configuration Summary +=================================================== # General --------- From b72427db26f12316559470b791882196665cf09f Mon Sep 17 00:00:00 2001 From: Edward Hartnett Date: Fri, 15 May 2020 05:31:53 -0600 Subject: [PATCH 9/9] more development of settings --- ufs_srweather_app_meta.h.in | 1 - 1 file changed, 1 deletion(-) diff --git a/ufs_srweather_app_meta.h.in b/ufs_srweather_app_meta.h.in index b106d7dd45..3c80970966 100644 --- a/ufs_srweather_app_meta.h.in +++ b/ufs_srweather_app_meta.h.in @@ -8,7 +8,6 @@ * include this file unless you want to probe the capabilities * of the build. * - * Ed Hartnett, 5/15/20 */ #ifndef UFS_SRWEATHER_APP_META_H