From 1890af1ffe6ec10b72c0bb15a1cf89c10e29c052 Mon Sep 17 00:00:00 2001 From: Ward Fisher Date: Thu, 17 Sep 2015 14:02:15 -0600 Subject: [PATCH] Removed library version check for pnetcdf from cmake build, for the time being. --- CMakeLists.txt | 53 +++++++++++++++++++++++++------------------------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 53b822365..0096f1a7c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -847,39 +847,40 @@ IF(ENABLE_PNETCDF) IF(NOT PNETCDF) MESSAGE(STATUS "Cannot find pNetCDF library. Disabling pNetCDF support.") SET(USE_PNETCDF OFF CACHE BOOL "") - ELSE() - SET(TMP_INC ${CMAKE_REQUIRED_INCLUDES}) - SET(TMP_LB ${CMAKE_REQUIRED_LIBRARIES}) - SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${PNETCDF}) - SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${PNETCDF_INCLUDE_DIR}) + ENDIF(NOT PNETCDF) +# ELSE() +## SET(TMP_INC ${CMAKE_REQUIRED_INCLUDES}) +# SET(TMP_LB ${CMAKE_REQUIRED_LIBRARIES}) +# SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${PNETCDF}) +# SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${PNETCDF_INCLUDE_DIR}) # Check to see if version > 1.6.0 - CHECK_C_SOURCE_RUNS(" + # CHECK_C_SOURCE_RUNS(" #include #include - int main() { - int major = PNETCDF_VERSION_MAJOR; - int minor = PNETCDF_VERSION_MINOR; - int version = major*1000 + minor; - int ok = (version >= (1*1000 + 6)); - return ok?0:1;}" - HAVE_PNETCDF_16) + # int main() { + # int major = PNETCDF_VERSION_MAJOR; + # int minor = PNETCDF_VERSION_MINOR; + # int version = major*1000 + minor; + # int ok = (version >= (1*1000 + 6)); + # return ok?0:1;}" + # HAVE_PNETCDF_16) - SET(CMAKE_REQUIRED_INCLUDES ${TMP_INC}) - SET(CMAKE_REQUIRED_LIBRARIES ${TMP_LB}) +# SET(CMAKE_REQUIRED_INCLUDES ${TMP_INC}) +# SET(CMAKE_REQUIRED_LIBRARIES ${TMP_LB}) - IF(HAVE_PNETCDF_16) - SET(ENABLE_PNETCDF "OFF") - MESSAGE(WARNING "ENABLE_PNETCDF requires version 1.6.0 or later; disabled") - ELSE() + #IF(HAVE_PNETCDF_16) + # SET(ENABLE_PNETCDF "OFF") + # MESSAGE(WARNING "ENABLE_PNETCDF requires version 1.6.0 or later; disabled") + # ELSE() - SET(STATUS_PNETCDF "ON") - INCLUDE_DIRECTORIES(${PNETCDF_INCLUDE_DIR}) - SET(HAVE_LIBPNETCDF ON) + # SET(STATUS_PNETCDF "ON") + # INCLUDE_DIRECTORIES(${PNETCDF_INCLUDE_DIR}) + # SET(HAVE_LIBPNETCDF ON) # pnetcdf => parallel - SET(STATUS_PARALLEL "ON") - SET(USE_PARALLEL ON) - ENDIF() - ENDIF() + # SET(STATUS_PARALLEL "ON") + # SET(USE_PARALLEL ON) + #ENDIF() + #ENDIF() ENDIF() # Enable Parallel Tests.