mirror of
https://github.com/Unidata/netcdf-c.git
synced 2025-02-23 16:59:54 +08:00
Merge remote-tracking branch 'origin/gh1739.wif' into gh1740.wif
This commit is contained in:
commit
6fafa6612c
@ -984,7 +984,7 @@ OPTION(ENABLE_NCZARR_S3_TESTS "Enable NCZarr S3 tests." OFF)
|
||||
|
||||
IF(ENABLE_NCZARR_S3_TESTS AND NOT ENABLE_NCZARR_S3)
|
||||
message(FATAL_ERROR "NCZarr S3 support is disabled; please specify option -DENABLE_NCZARR_S3_TESTS=no")
|
||||
SET(ENABLE_NCZARR_S3_TESTS OFF CACHE BOOL "NCARR S3 TESTS" FORCE)
|
||||
SET(ENABLE_NCZARR_S3_TESTS OFF CACHE BOOL "NCARR S3 TESTS" FORCE)
|
||||
ENDIF()
|
||||
|
||||
# See if aws-s3-sdk is available
|
||||
@ -994,7 +994,7 @@ find_package(AWSSDK REQUIRED)
|
||||
set(SERVICE s3)
|
||||
AWSSDK_DETERMINE_LIBS_TO_LINK(SERVICE AWSSDK_LINK_LIBRARIES)
|
||||
IF(AWSSDK_FOUND)
|
||||
SET(ENABLE_S3_SDK ON CACHE BOOL "S3 SDK" FORCE)
|
||||
SET(ENABLE_S3_SDK ON CACHE BOOL "S3 SDK" FORCE)
|
||||
ELSE()
|
||||
SET(ENABLE_S3_SDK OFF CACHE BOOL "S3 SDK" FORCE)
|
||||
ENDIF()
|
||||
@ -1580,24 +1580,32 @@ IF(NC_M4)
|
||||
SET(HAVE_M4 TRUE)
|
||||
ELSE()
|
||||
MESSAGE(STATUS "m4 not found.")
|
||||
SET(HAVE_M4 FALSE)
|
||||
ENDIF()
|
||||
|
||||
MACRO(GEN_m4 filename dest)
|
||||
set(${dest} "${CMAKE_CURRENT_BINARY_DIR}/${filename}.c")
|
||||
IF(HAVE_M4)
|
||||
ADD_CUSTOM_COMMAND(
|
||||
OUTPUT ${${dest}}
|
||||
COMMAND ${NC_M4}
|
||||
ARGS ${M4FLAGS} ${CMAKE_CURRENT_SOURCE_DIR}/${filename}.m4 > ${${dest}}
|
||||
VERBATIM
|
||||
)
|
||||
ELSE(HAVE_M4)
|
||||
IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${filename}.c)
|
||||
FILE(COPY ${CMAKE_CURRENT_SOURCE_DIR}/${filename}.c
|
||||
DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
|
||||
ELSE()
|
||||
MESSAGE(FATAL_ERROR "File ${CMAKE_CURRENT_SOURCE_DIR}/${filename}.c does not exists, and can not be generated")
|
||||
MACRO(GEN_m4 filename)
|
||||
|
||||
# If m4 isn't present, and the generated file doesn't exist,
|
||||
# it cannot be generated and an error should be thrown.
|
||||
IF(NOT HAVE_M4)
|
||||
IF(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${filename.c})
|
||||
MESSAGE(FATAL_ERROR "m4 is required to generate ${filename}.c. Please install m4 so that it is on the PATH and try again.")
|
||||
ENDIF()
|
||||
ENDIF(NOT HAVE_M4)
|
||||
|
||||
IF(HAVE_M4)
|
||||
# If m4 is available, remove generated file if it exists.
|
||||
IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${filename}.c)
|
||||
FILE(REMOVE ${CMAKE_CURRENT_SOURCE_DIR}/${filename}.c)
|
||||
ENDIF()
|
||||
|
||||
ADD_CUSTOM_COMMAND(
|
||||
OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/${filename}.c
|
||||
COMMAND ${NC_M4}
|
||||
ARGS ${M4FLAGS} ${CMAKE_CURRENT_SOURCE_DIR}/${filename}.m4 > ${CMAKE_CURRENT_SOURCE_DIR}/${filename}.c
|
||||
VERBATIM
|
||||
)
|
||||
|
||||
ENDIF(HAVE_M4)
|
||||
ENDMACRO(GEN_m4)
|
||||
|
||||
|
@ -7,8 +7,10 @@ SET(libsrc_SOURCES v1hpg.c putget.c attr.c nc3dispatch.c
|
||||
# Process these files with m4.
|
||||
SET(m4_SOURCES attr ncx putget)
|
||||
foreach (f ${m4_SOURCES})
|
||||
GEN_m4(${f} dest)
|
||||
LIST(APPEND libsrc_SOURCES ${dest})
|
||||
GEN_m4(${f})
|
||||
IF(NOT EXISTS ${f}.c)
|
||||
MESSAGE(FATAL_ERROR "m4 is required to generate ${f}.c. Please install m4 on the PATH and try again.")
|
||||
ENDIF()
|
||||
endforeach(f)
|
||||
|
||||
LIST(APPEND libsrc_SOURCES pstdint.h ncio.h ncx.h)
|
||||
|
Loading…
Reference in New Issue
Block a user