mirror/netcdf-c
2
0
Fork 0
mirror of https://github.com/Unidata/netcdf-c.git synced 2025-03-25 17:40:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
Ward Fisher 2012-09-20 21:18:20 +00:00
parent 650c6fe362
commit 0d221a4e20
4 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
CMakeLists.txt
View File

@ -192,19 +192,20 @@ IF (USE_HDF5 OR ENABLE_NETCDF_4)
MESSAGE(STATUS "Found SZip: ${SZIP_LIBRARY}")
ENDIF()
ENDIF()
FIND_PACKAGE(ZLIB)
IF(NOT ZLIB_LIBRARY)
MESSAGE(FATAL_ERROR "HDF5 Support specified, cannot find ZLib.")
ENDIF()
SET(USE_ZLIB ON)
INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIRS})
SET(H5_USE_16_API 1)
ENDIF ()
FIND_PACKAGE(ZLIB)
IF(NOT ZLIB_LIBRARY)
MESSAGE(FATAL_ERROR "HDF5 Support specified, cannot find ZLib.")
ENDIF()
SET(USE_ZLIB ON)
INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIRS})
# Option to Build DAP Client
OPTION (ENABLE_DAP "Enable DAP Client." ON)
IF (ENABLE_DAP)

2
cmake_config.h.in
View File

@ -3,7 +3,7 @@
#ifdef _MSC_VER
/* Disable a few warnings under Visual Studio, for the
time being. */
#pragma warning( disable: 4018 4996 4244 )
#pragma warning( disable: 4018 4996 4244 4305 )
#define unlink _unlink
#define open _open
#define close _close

4
liblib/CMakeLists.txt
View File

@ -30,7 +30,7 @@ ADD_LIBRARY(netcdf stub.c ${LARGS} )
#####
# Add dependencies required for linking.
#####
SET(TLL_LIBS ${HAVE_LIBM})
SET(TLL_LIBS ${HAVE_LIBM} ${ZLIB_LIBRARY})
#TARGET_LINK_LIBRARIES(netcdf ${HAVE_LIBM})
#TARGET_LINK_LIBRARIES(netcdf ${MMATH})
@ -41,7 +41,7 @@ IF(USE_DAP)
ENDIF()
IF(USE_HDF5 OR USE_NETCDF4)
SET(TLL_LIBS ${TLL_LIBS} ${SZIP_LIBRARY} ${ZLIB_LIBRARY} ${HDF5_LIBRARIES})
SET(TLL_LIBS ${TLL_LIBS} ${SZIP_LIBRARY} ${HDF5_LIBRARIES})
ENDIF()
IF(ENABLE_PNETCDF AND PNETCDF)

16
ncdump/CMakeLists.txt
View File

@ -125,14 +125,14 @@ IF(MSVC)
PROPERTIES LINK_FLAGS " /NODEFAULTLIB:MSVCRT"
)
IF(ENABLE_TESTS)
SET_TARGET_PROPERTIES(ncdump_tst_nans
PROPERTIES LINK_FLAGS " /NODEFAULTLIB:MSVCRT"
)
SET_TARGET_PROPERTIES(ncdump_tst_special_atts
PROPERTIES LINK_FLAGS " /NODEFAULTLIB:MSVCRT"
)
ENDIF()
#IF(ENABLE_TESTS)
# SET_TARGET_PROPERTIES(ncdump_tst_nans
# PROPERTIES LINK_FLAGS " /NODEFAULTLIB:MSVCRT"
# )
# SET_TARGET_PROPERTIES(ncdump_tst_special_atts
# PROPERTIES LINK_FLAGS " /NODEFAULTLIB:MSVCRT"
# )
#ENDIF()
ENDIF()