Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove now unused cmake #2890

Merged
merged 5 commits into from
Mar 19, 2024
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1541,13 +1541,8 @@ foreach(_LIB ${ALL_TLL_LIBS})
list(APPEND LINKFLAGS "-L${_LIB_DIR}")
endforeach()

#set(NC_LIBS "-lnetcdf ${NC_LIBS}")
if(NC_LIBS)
string(REPLACE ";" " " NC_LIBS "${NC_LIBS}")
string(REPLACE "-lhdf5::hdf5-shared" "-lhdf5" NC_LIBS ${NC_LIBS})
string(REPLACE "-lhdf5::hdf5_hl-shared" "-lhdf5_hl" NC_LIBS ${NC_LIBS})
string(REPLACE "-lhdf5::hdf5-static" "-lhdf5" NC_LIBS ${NC_LIBS})
string(REPLACE "-lhdf5::hdf5_hl-static" "-lhdf5_hl" NC_LIBS ${NC_LIBS})
endif()

string(REPLACE ";" " " LINKFLAGS "${LINKFLAGS}")
Expand Down
34 changes: 27 additions & 7 deletions nc-config.cmake.in
Original file line number Diff line number Diff line change
Expand Up @@ -166,13 +166,15 @@ Available values for OPTION include:
--has-stdfilters lists the standard filters enabled
--has-benchmarks whether benchmarks enabled

--libs library linking information for netcdf
--static library linking information for statically-compiled netcdf
--prefix Install prefix
--includedir Include directory
--libdir Library directory
--plugindir Plugin directory
--version Library version
--libs library linking information for netcdf
--libs-ac-syntax forces autotools-compatible syntax argument for libraries
--static library linking information for statically-compiled netcdf
--prefix Install prefix
--includedir Include directory
--libdir Library directory
--plugindir Plugin directory
--version Library version
--build-system Build System

EOF

Expand Down Expand Up @@ -216,6 +218,7 @@ all()
echo " --libdir -> $libdir"
echo " --plugindir -> $plugindir"
echo " --version -> $version"
echo " --build-system -> cmake"
echo
}

Expand Down Expand Up @@ -251,6 +254,10 @@ while test $# -gt 0; do
--all)
all
;;

--build-system)
echo "cmake"
;;

--cc)
echo $cc
Expand Down Expand Up @@ -347,7 +354,20 @@ while test $# -gt 0; do
echo $libs
fi
;;
--libs-ac-syntax)

libs=$(echo $libs | sed 's/hdf5::hdf5_hl/hdf5_hl/g')
libs=$(echo $libs | sed 's/HDF5::HDF5/hdf5/g')

if [ "x$HAS_STATIC" = "xTRUE" ]; then
libsprivate=$(echo $libsprivate | sed 's/hdf5::hdf5_hl/hdf5_hl/g')
libsprivate=$(echo $libsprivate | sed 's/HDF5::HDF5/hdf5/g')
echo $libs $libsprivate
else
echo $libs
fi

;;
--static)

;;
Expand Down
6 changes: 5 additions & 1 deletion nc-config.in
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ Available values for OPTION include:
--libdir Library directory
--plugindir Plugin directory
--version Library version
--build-system Build System

EOF

Expand Down Expand Up @@ -120,6 +121,7 @@ all()
echo " --libdir -> $libdir"
echo " --plugindir -> $plugindir"
echo " --version -> $version"
echo " --build-system -> autotools"
echo
}

Expand Down Expand Up @@ -156,7 +158,9 @@ while test $# -gt 0; do
--all)
all
;;

--build-system)
echo "autotools"
;;
--cc)
echo $cc
;;
Expand Down
Loading