From b6ab7486cba0d04c796e4a5e4e9e2978b7fe60b2 Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Tue, 1 Mar 2022 11:57:14 +0100 Subject: [PATCH] spns #26828: convergence EDF: netcfd unused flags --- products/compil_scripts/netcdf-4.6.2.sh | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/products/compil_scripts/netcdf-4.6.2.sh b/products/compil_scripts/netcdf-4.6.2.sh index cc883b9..d226a3a 100755 --- a/products/compil_scripts/netcdf-4.6.2.sh +++ b/products/compil_scripts/netcdf-4.6.2.sh @@ -19,11 +19,6 @@ CMAKE_OPTIONS+=" -DBUILD_UTILITIES=ON" CMAKE_OPTIONS+=" -DBUILD_SHARED_LIBS=ON" CMAKE_OPTIONS+=" -DENABLE_TESTS=ON" CMAKE_OPTIONS+=" -DPYTHON_EXECUTABLE=${PYTHONBIN}" -CMAKE_OPTIONS+=" -DSWIG_EXECUTABLE=${SWIG_ROOT_DIR}/bin/swig" - -if [ -n "$TBB_ROOT_DIR" ] && [ "${TBB_ROOT_DIR}" != "/usr" ]; then - CMAKE_OPTIONS+=" -DTBB_ROOT_DIR=${TBB_ROOT_DIR}" -fi ### libxml2 settings if [ -n "$LIBXML2_ROOT_DIR" ] && [ "${LIBXML2_ROOT_DIR}" != "/usr" ]; then @@ -37,10 +32,7 @@ if [ -n "$HDF5_ROOT_DIR" ] && [ "${HDF5_ROOT_DIR}" != "/usr" ]; then CMAKE_OPTIONS+=" -DHDF5_DIR:PATH=${HDF5_ROOT_DIR}/share/cmake/hdf5" CMAKE_OPTIONS+=" -DHDF5_USE_STATIC_LIBRARIES:BOOL=OFF" CMAKE_OPTIONS+=" -DHDF5_ROOT:PATH=${HDF5_ROOT_DIR}" - CMAKE_OPTIONS+=" -DHDF5_hdf5_LIBRARY_RELEASE=${HDF5_ROOT_DIR}/lib" - CMAKE_OPTIONS+=" -DHDF5_hdf5_hl_LIBRARY_RELEASE=${HDF5_ROOT_DIR}/lib/libhdf5_hl.so" CMAKE_OPTIONS+=" -DHDF5_HL_LIBRARY=${HDF5_ROOT_DIR}/lib/libhdf5_hl.so" - CMAKE_OPTIONS+=" -DHDF5_C_INCLUDE_DIR=${HDF5_ROOT_DIR}/include" fi ### libxml2 settings @@ -50,13 +42,6 @@ if [ -n "$LIBXML2_ROOT_DIR" ] && [ "${LIBXML2_ROOT_DIR}" != "/usr" ]; then CMAKE_OPTIONS+=" -DLIBXML2_XMLLINT_EXECUTABLE=${LIBXML2_ROOT_DIR}/bin/xmllint" fi -## nlopt -if [ -n "$NLOPT_ROOT_DIR" ] && [ "${NLOPT_ROOT_DIR}" != "/usr" ]; then - CMAKE_OPTIONS+=" -DNLOPT_INCLUDE_DIRS:STRING=${NLOPT_ROOT_DIR}/include" - CMAKE_OPTIONS+=" -DNLOPT_LIBRARIES:STRING=${NLOPT_ROOT_DIR}/lib" - CMAKE_OPTIONS+=" -DNLOPT_DIR:STRING=${NLOPT_ROOT_DIR}" -fi - echo echo "*** cmake" $CMAKE_OPTIONS cd $BUILD_DIR -- 2.39.2