core
/
eccodes
mirror of https://github.com/ecmwf/eccodes.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove unnecessary includes for netcdf and numpy from pkgconfig files

This commit is contained in:
Shahram Najm 2016-09-28 10:00:40 +01:00
parent a4e7cc4cfa 871a50e432
commit 5d7ad0ed0b
2 changed files with 51 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -341,6 +341,7 @@ ecbuild_pkgconfig(
URL "https://software.ecmwf.int/wiki/display/ECC/"
DESCRIPTION "The ecCodes library"
LIBRARIES eccodes
IGNORE_INCLUDE_DIRS ${PYTHON_INCLUDE_DIRS} ${NUMPY_INCLUDE_DIRS} ${NETCDF_INCLUDE_DIRS}
VARIABLES HAVE_JPG HAVE_LIBJASPER HAVE_LIBOPENJPEG
HAVE_ECCODES_THREADS HAVE_ECCODES_OMP_THREADS
HAVE_NETCDF HAVE_PYTHON HAVE_FORTRAN HAVE_PNG HAVE_AEC
@ -352,6 +353,7 @@ if( EC_HAVE_FORTRAN )
LIBRARIES eccodes_f90 eccodes
DESCRIPTION "The ecCodes library for Fortran 90"
IGNORE_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/fortran ${PROJECT_BINARY_DIR}/fortran
${PYTHON_INCLUDE_DIRS} ${NUMPY_INCLUDE_DIRS} ${NETCDF_INCLUDE_DIRS}
VARIABLES HAVE_JPG HAVE_LIBJASPER HAVE_LIBOPENJPEG
HAVE_ECCODES_THREADS HAVE_ECCODES_OMP_THREADS
HAVE_NETCDF HAVE_PYTHON HAVE_PNG HAVE_AEC

49
show_compile.sh Executable file
View File

@ -0,0 +1,49 @@
#!/bin/sh
# Copyright 2005-2016 ECMWF.
#
# This software is licensed under the terms of the Apache Licence Version 2.0
# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
#
# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
#
if [ $# -ne 1 ]; then
echo "Usage: `basename $0` /path/to/ecCodes/installation"
exit 1
fi
set -e
PACKAGE=eccodes_f90
ECCODES_INSTALL_PATH=$1
ECCODES_PKGCONF_PATH=$ECCODES_INSTALL_PATH/lib/pkgconfig
if [ ! -d "$ECCODES_INSTALL_PATH" ]; then
echo "Error: Installation path does not exist!" 2>&1
exit 1
fi
if [ ! -d "$ECCODES_PKGCONF_PATH" ]; then
echo "Error: Could not find pkgconfig directory in installation path!" 2>&1
echo " Expected path: $ECCODES_PKGCONF_PATH" 2>&1
exit 1
fi
if ! command -v pkg-config >/dev/null 2>&1; then
echo "Error: cannot find pkg-config command!" 2>&1
exit 1
fi
export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$ECCODES_PKGCONF_PATH
LIBS=`pkg-config $PACKAGE --libs`
INCL=`pkg-config $PACKAGE --cflags`
FCMP=`pkg-config $PACKAGE --variable=FC`
CCMP=`pkg-config $PACKAGE --variable=CC`
echo
echo "Compilation for Fortran 90 ..."
echo "$FCMP myprog.f90 $LIBS $INCL"
echo
echo "Compilation for C ..."
echo "$CCMP myprog.c $LIBS $INCL"
echo