mirror of
https://github.com/Unidata/netcdf-c.git
synced 2025-02-17 16:50:18 +08:00
moving the dependencies inclusion
This commit is contained in:
parent
2f794b7e7f
commit
656fdbb374
@ -894,6 +894,16 @@ IF(NOT ENABLE_HDF5 AND ENABLE_EXAMPLE_TESTS)
|
||||
SET(ENABLE_EXAMPLE_TESTS OFF)
|
||||
ENDIF()
|
||||
|
||||
##################################
|
||||
# Dependencies
|
||||
##################################
|
||||
|
||||
include(cmake/dependencies.cmake)
|
||||
|
||||
################################
|
||||
# End Dependencies
|
||||
################################
|
||||
|
||||
# Enable Parallel IO with netCDF-4/HDF5 files using HDF5 parallel I/O.
|
||||
SET(STATUS_PARALLEL "OFF")
|
||||
set(IMPORT_MPI "")
|
||||
@ -1165,16 +1175,6 @@ MARK_AS_ADVANCED(ENABLE_DAP_REMOTE_TESTS ENABLE_DAP_LONG_TESTS USE_REMOTE_CDASH
|
||||
MARK_AS_ADVANCED(ENABLE_DOXYGEN_BUILD_RELEASE_DOCS DOXYGEN_ENABLE_TASKS ENABLE_DOXYGEN_SERVER_SIDE_SEARCH)
|
||||
MARK_AS_ADVANCED(ENABLE_SHARED_LIBRARY_VERSION)
|
||||
|
||||
##################################
|
||||
# Dependencies
|
||||
##################################
|
||||
|
||||
include(cmake/dependencies.cmake)
|
||||
|
||||
################################
|
||||
# End Dependencies
|
||||
################################
|
||||
|
||||
################################
|
||||
# Option checks
|
||||
################################
|
||||
@ -1700,7 +1700,7 @@ configure_file("${netCDF_SOURCE_DIR}/config.h.cmake.in"
|
||||
"${netCDF_BINARY_DIR}/config.h")
|
||||
ADD_DEFINITIONS(-DHAVE_CONFIG_H)
|
||||
INCLUDE_DIRECTORIES(${netCDF_BINARY_DIR})
|
||||
# End autotools-style checs for config.h
|
||||
# End autotools-style checks for config.h
|
||||
|
||||
#####
|
||||
# Set core names of the libraries.
|
||||
|
@ -629,8 +629,7 @@ ENDIF(ENABLE_LIBXML2)
|
||||
################################
|
||||
# MPI
|
||||
################################
|
||||
OPTION(ENABLE_PARALLEL4 "Build netCDF-4 with parallel IO" "${HDF5_PARALLEL}")
|
||||
IF(ENABLE_PARALLEL4 AND ENABLE_HDF5 AND HDF5_PARALLEL)
|
||||
IF(ENABLE_PARALLEL4 OR HDF5_PARALLEL)
|
||||
FIND_PACKAGE(MPI REQUIRED)
|
||||
ENDIF()
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user