From dba34ac5c2b56a3fb9353fd68b139e4c956464a1 Mon Sep 17 00:00:00 2001 From: Kyle Shores Date: Mon, 18 Mar 2024 15:40:05 -0500 Subject: [PATCH] Replace ENABLE_PNETCDF with NETCDF_ENABLE_PNETCDF --- .github/workflows/run_tests_ubuntu.yml | 2 +- CMakeLists.txt | 8 ++++---- cmake/dependencies.cmake | 2 +- include/CMakeLists.txt | 2 +- libdispatch/CMakeLists.txt | 2 +- liblib/CMakeLists.txt | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/run_tests_ubuntu.yml b/.github/workflows/run_tests_ubuntu.yml index 6a279dddd..186f8da18 100644 --- a/.github/workflows/run_tests_ubuntu.yml +++ b/.github/workflows/run_tests_ubuntu.yml @@ -602,7 +602,7 @@ jobs: run: | mkdir build cd build - LD_LIBRARY_PATH=${LD_LIBRARY_PATH} cmake .. -DCMAKE_C_COMPILER=mpicc -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH} -DNETCDF_ENABLE_DAP=TRUE -DNETCDF_ENABLE_HDF5=TRUE -DNETCDF_ENABLE_NCZARR=TRUE -D NETCDF_ENABLE_DAP_LONG_TESTS=TRUE -DENABLE_PNETCDF=TRUE + LD_LIBRARY_PATH=${LD_LIBRARY_PATH} cmake .. -DCMAKE_C_COMPILER=mpicc -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH} -DNETCDF_ENABLE_DAP=TRUE -DNETCDF_ENABLE_HDF5=TRUE -DNETCDF_ENABLE_NCZARR=TRUE -D NETCDF_ENABLE_DAP_LONG_TESTS=TRUE -DNETCDF_ENABLE_PNETCDF=TRUE - name: Print Summary shell: bash -l {0} diff --git a/CMakeLists.txt b/CMakeLists.txt index dfdf7cb9f..29a06a090 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -443,7 +443,7 @@ endif() option(NETCDF_ENABLE_HDF4 "Build netCDF-4 with HDF4 read capability(HDF4, HDF5 and Zlib required)." OFF) option(NETCDF_ENABLE_DAP "Enable DAP2 and DAP4 Client." ON) option(NETCDF_ENABLE_NCZARR "Enable NCZarr Client." ON) -option(ENABLE_PNETCDF "Build with parallel I/O for CDF-1, 2, and 5 files using PnetCDF." OFF) +option(NETCDF_ENABLE_PNETCDF "Build with parallel I/O for CDF-1, 2, and 5 files using PnetCDF." OFF) set(NETCDF_ENABLE_CDF5 AUTO CACHE STRING "AUTO") option(NETCDF_ENABLE_CDF5 "Enable CDF5 support" ON) @@ -893,9 +893,9 @@ if(NETCDF_ENABLE_PARALLEL4 AND NETCDF_ENABLE_HDF5) endif() # Options to enable parallel IO for classic formats with PnetCDF library. -set(STATUS_PNETCDF ${ENABLE_PNETCDF}) -set(USE_PNETCDF ${ENABLE_PNETCDF}) -if(ENABLE_PNETCDF) +set(STATUS_PNETCDF ${NETCDF_ENABLE_PNETCDF}) +set(USE_PNETCDF ${NETCDF_ENABLE_PNETCDF}) +if(NETCDF_ENABLE_PNETCDF) set(STATUS_PARALLEL ON) set(USE_PARALLEL ON CACHE BOOL "") ### diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake index 7b806c760..4e97847d5 100644 --- a/cmake/dependencies.cmake +++ b/cmake/dependencies.cmake @@ -454,7 +454,7 @@ endif() ################################ # Parallel IO ################################ -if(ENABLE_PNETCDF) +if(NETCDF_ENABLE_PNETCDF) find_package(PNETCDF 1.6.0 REQUIRED) if(NOT PNETCDF_HAS_RELAXED_COORD_BOUND) message(FATAL_ERROR "Pnetcdf must be built with relax-coord-bound enabled") diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt index ba1cb7198..aa865f854 100644 --- a/include/CMakeLists.txt +++ b/include/CMakeLists.txt @@ -35,7 +35,7 @@ INSTALL(FILES ${netCDF_BINARY_DIR}/include/netcdf_dispatch.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} COMPONENT headers) -IF(ENABLE_PNETCDF OR NETCDF_ENABLE_PARALLEL4) +IF(NETCDF_ENABLE_PNETCDF OR NETCDF_ENABLE_PARALLEL4) INSTALL(FILES ${netCDF_SOURCE_DIR}/include/netcdf_par.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} COMPONENT headers) diff --git a/libdispatch/CMakeLists.txt b/libdispatch/CMakeLists.txt index a36b9af45..e8086285f 100644 --- a/libdispatch/CMakeLists.txt +++ b/libdispatch/CMakeLists.txt @@ -80,7 +80,7 @@ if(STATUS_PARALLEL) target_link_libraries(dispatch PUBLIC MPI::MPI_C) endif(STATUS_PARALLEL) -if (ENABLE_PNETCDF) +if (NETCDF_ENABLE_PNETCDF) target_link_libraries(dispatch PUBLIC PNETCDF::PNETCDF) endif() diff --git a/liblib/CMakeLists.txt b/liblib/CMakeLists.txt index 1bcf066bc..b09e8ecc9 100644 --- a/liblib/CMakeLists.txt +++ b/liblib/CMakeLists.txt @@ -151,7 +151,7 @@ if(USE_HDF4) set(TLL_LIBS ${HDF4_LIBRARIES} ${TLL_LIBS}) endif() -if(ENABLE_PNETCDF) +if(NETCDF_ENABLE_PNETCDF) SET(TLL_LIBS ${TLL_LIBS} PNETCDF::PNETCDF) endif()