mirror/netcdf-c
2
0
Fork 0
mirror of https://github.com/Unidata/netcdf-c.git synced 2024-11-21 03:13:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Comment out debugging messages, will remove before final merge. Clean up the logic, remove some rough edges.

Browse Source
This commit is contained in:
Ward Fisher 2024-03-19 16:36:20 -06:00
parent 67609b0965
commit 43573c5669
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
CMakeLists.txt
View File

@ -1710,8 +1710,17 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/libnetcdf.settings.in"
file(READ "${CMAKE_CURRENT_BINARY_DIR}/libnetcdf.settings"
LIBNETCDF_SETTINGS)
message(STATUS ${LIBNETCDF_SETTINGS})
message(STATUS ${DEPR_OPT})
# Install libnetcdf.settings file into same location
###
# Report deprecated options detected by
# cmake/deprecated.cmake. Added in support of
# https://github.com/Unidata/netcdf-c/pull/2895
###
if(DEFINED DEPR_OPT)
message(STATUS ${DEPR_OPT})
endif()
# Install libnetcdf.settings file into same location
# as the libraries.
install(FILES "${netCDF_BINARY_DIR}/libnetcdf.settings"
DESTINATION "${CMAKE_INSTALL_LIBDIR}"

9
cmake/deprecated.cmake
View File

@ -7,18 +7,19 @@
#
#######
set(DEPR_OPT "Warning! Deprecated Options used. Please migrate your build system as follows:" CACHE INTERNAL "" FORCE)
function(check_depr_opt arg)
if(DEFINED ${arg})
if(NOT DEFINED DEPR_OPT)
set(DEPR_OPT "Warning! Deprecated Options used. Please migrate your build system as follows:" CACHE INTERNAL "" FORCE)
endif()
#message(STATUS "arg: ${arg} - ${${arg}}")
set(val ${${arg}})
#MESSAGE("val: ${val}")
message(WARNING "${arg} is deprecated and will be removed. Please use NETCDF_${arg} in the future")
set(NETCDF_${arg} ${val} CACHE INTERNAL "" FORCE)
#MESSAGE(STATUS "Setting NETCDF_${arg} to ${val}")
#MESSAGE(STATUS "Result: NETCDF_${arg} is ${NETCDF_${arg}}")
set(DEPR_OPT "${DEPR_OPT}\n\to ${arg} --> NETCDF_${arg}" PARENT_SCOPE)
endif()
@ -37,6 +38,6 @@ list(APPEND opts ENABLE_S3_INTERNAL ENABLE_STDIO ENABLE_STRICT_NULL_BYTE_HEADER_
list(APPEND opts FIND_SHARED_LIBS LIB_NAME)
foreach(opt ${opts})
MESSAGE(STATUS "Option: ${opt}")
#MESSAGE(STATUS "Option: ${opt}")
check_depr_opt(${opt})
endforeach()