mirror/netcdf-c
2
0
Fork 0
mirror of https://github.com/Unidata/netcdf-c.git synced 2025-01-30 16:10:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

Removed library version check for pnetcdf from cmake build, for the time being.

Browse Source
This commit is contained in:
Ward Fisher 2015-09-17 14:02:15 -06:00 committed by Ward Fisher
parent dccbc87d24
commit 1890af1ffe
1 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
CMakeLists.txt
View File

@ -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 <stdio.h>
#include <pnetcdf.h>
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.