From 25923f350cfd03d70c0b81db5f4b651220ff6ebe Mon Sep 17 00:00:00 2001 From: Edward Hartnett Date: Tue, 14 Jul 2020 07:34:18 -0600 Subject: [PATCH] further development of build summary --- CMakeLists.txt | 40 +++++++++++++++++++++++----------------- libpio.settings.in | 23 ++++------------------- 2 files changed, 27 insertions(+), 36 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 94b1df22ce2..a47930005b5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,6 +8,9 @@ set(VERSION_MINOR 5 CACHE STRING "Project minor version number.") set(VERSION_PATCH 1 CACHE STRING "Project patch version number.") mark_as_advanced(VERSION_MAJOR VERSION_MINOR VERSION_PATCH) +# This is needed for the libpio.settings file. +SET(PACKAGE_VERSION ${VERSION}) + # Determine the configure date. IF(DEFINED ENV{SOURCE_DATE_EPOCH}) EXECUTE_PROCESS( @@ -259,6 +262,26 @@ endif () # Configure and print the libpio.settings file. ##### +# 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) + set(TMP_BUILDNAME "${osname}-${osrel}-${cpu}") +ENDIF() + +# Set +SET(prefix ${CMAKE_INSTALL_PREFIX}) +SET(exec_prefix ${CMAKE_INSTALL_PREFIX}) +SET(libdir ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}) +SET(includedir ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}) +SET(CC ${CMAKE_C_COMPILER}) + # Set variables to mirror those used by autoconf. # This way we don't need to maintain two separate template # files. @@ -278,29 +301,12 @@ SET(LDFLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${CMAKE_SHARED_LINKER_FLAGS_${CMAKE_BU 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_SZIP) is_enabled(USE_SZIP HAS_SZIP_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) -is_enabled(ENABLE_NCZARR HAS_NCZARR) -is_enabled(ENABLE_S3_SDK HAS_S3_SDK) # Generate file from template. CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/libpio.settings.in" diff --git a/libpio.settings.in b/libpio.settings.in index af7987ee843..df5d14bb256 100644 --- a/libpio.settings.in +++ b/libpio.settings.in @@ -3,8 +3,7 @@ # General ------- -NetCDF Version: @PACKAGE_VERSION@ -Dispatch Version: @NC_DISPATCH_VERSION@ +PIO Version: @PACKAGE_VERSION@ Configured On: @CONFIG_DATE@ Host System: @host_cpu@-@host_vendor@-@host_os@ Build Directory: @abs_top_builddir@ @@ -25,23 +24,9 @@ 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@ +SZIP Support: @HAS_SZIP@ +SZIP Write Support: @HAS_SZIP_WRITE@ Parallel Filters: @HAS_PAR_FILTERS@ -NCZarr Support: @HAS_NCZARR@ -NCZarr S3: @HAS_S3_SDK@ +