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

ECC-63: Change name of the library

This commit is contained in:
Shahram Najm 2015-02-13 18:04:42 +00:00
parent b6c9ac356a
commit f0ea1ec12f
10 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@ -214,7 +214,7 @@ endif()
set( GRIB_API_TPLS AEC PNG Jasper OpenJPEG CMath )
set( GRIB_API_INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_BINARY_DIR}/src )
set( GRIB_API_LIBRARIES grib_api )
set( GRIB_API_LIBRARIES eccodes )
get_directory_property( COMPILE_DEFINITIONS ECCODES_DEFINITIONS )
@ -263,7 +263,7 @@ add_custom_target(dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source)
if( EC_HAVE_FORTRAN )
list( APPEND GRIB_API_INCLUDE_DIRS ${CMAKE_Fortran_MODULE_DIRECTORY} )
list( APPEND GRIB_API_LIBRARIES grib_api_f77 grib_api_f90 )
list( APPEND GRIB_API_LIBRARIES eccodes_f77 eccodes_f90 )
endif()
if( NOT PROJECT_NAME STREQUAL CMAKE_PROJECT_NAME )
@ -282,7 +282,7 @@ ecbuild_pkgconfig(
NAME eccodes
URL "https://software.ecmwf.int/wiki/display/ECC/"
DESCRIPTION "The ecCodes library"
LIBRARIES grib_api
LIBRARIES eccodes
VARIABLES HAVE_JPG HAVE_LIBJASPER HAVE_GRIB_THREADS HAVE_NETCDF
HAVE_PYTHON HAVE_FORTRAN HAVE_PNG HAVE_AEC
)
@ -290,7 +290,7 @@ if( EC_HAVE_FORTRAN )
ecbuild_pkgconfig(
NAME eccodes_f90
URL "https://software.ecmwf.int/wiki/display/ECC/"
LIBRARIES grib_api_f90 grib_api
LIBRARIES eccodes_f90 eccodes
DESCRIPTION "The ecCodes library for Fortran 90"
IGNORE_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/fortran ${PROJECT_BINARY_DIR}/fortran
VARIABLES HAVE_JPG HAVE_LIBJASPER HAVE_GRIB_THREADS HAVE_NETCDF
@ -299,7 +299,7 @@ if( EC_HAVE_FORTRAN )
ecbuild_pkgconfig(
NAME eccodes_f77
URL "https://software.ecmwf.int/wiki/display/ECC/"
LIBRARIES grib_api_f77 grib_api
LIBRARIES eccodes_f77 eccodes
DESCRIPTION "The ecCodes library for Fortran 77"
IGNORE_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/fortran ${PROJECT_BINARY_DIR}/fortran
VARIABLES HAVE_JPG HAVE_LIBJASPER HAVE_GRIB_THREADS HAVE_NETCDF

4
examples/C/CMakeLists.txt
View File

@ -45,7 +45,7 @@ foreach( tool ${test_bins} )
ecbuild_add_executable( TARGET ${tool}
NOINSTALL
SOURCES ${tool}.c
LIBS grib_api
LIBS eccodes
)
endforeach()
@ -90,7 +90,7 @@ endforeach()
# Tests with no script
ecbuild_add_test( TARGET c_new_sample
SOURCES new_sample.c
LIBS grib_api
LIBS eccodes
ARGS "out.grib"
ENVIRONMENT "ECCODES_SAMPLES_PATH=${PROJECT_SOURCE_DIR}/samples" "ECCODES_DEFINITION_PATH=${PROJECT_SOURCE_DIR}/definitions"
)

10
examples/F90/CMakeLists.txt
View File

@ -44,7 +44,7 @@ list( APPEND tests
# ecbuild_add_test( TARGET test_f90_samples
# LINKER_LANGUAGE Fortran
# SOURCES samples.f90
# LIBS grib_api_f90 grib_api
# LIBS eccodes_f90 eccodes
# COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/samples.sh
# CONDITION EC_HAVE_FORTRAN
# )
@ -57,7 +57,7 @@ foreach( tool ${tests} )
SOURCES ${tool}.f90
CONDITION EC_HAVE_FORTRAN
LINKER_LANGUAGE Fortran
LIBS grib_api_f90 grib_api
LIBS eccodes_f90 eccodes
)
# Add the test which depends on the above executable
ecbuild_add_test( TARGET f_${tool}_test
@ -76,21 +76,21 @@ ecbuild_add_executable( TARGET f_new_from_file
SOURCES new_from_file.f90
CONDITION EC_HAVE_FORTRAN
LINKER_LANGUAGE Fortran
LIBS grib_api_f90 grib_api
LIBS eccodes_f90 eccodes
)
ecbuild_add_executable( TARGET f_copy_namespace
NOINSTALL
SOURCES copy_namespace.f90
CONDITION EC_HAVE_FORTRAN
LINKER_LANGUAGE Fortran
LIBS grib_api_f90 grib_api
LIBS eccodes_f90 eccodes
)
ecbuild_add_executable( TARGET f_set_gvc
NOINSTALL
SOURCES set_gvc.f90
CONDITION EC_HAVE_FORTRAN
LINKER_LANGUAGE Fortran
LIBS grib_api_f90 grib_api
LIBS eccodes_f90 eccodes
)

2
examples/python/CMakeLists.txt
View File

@ -17,7 +17,7 @@ foreach( tool ${test_bins} )
NOINSTALL
SOURCES ${tool}.c
CONDITION HAVE_PYTHON
LIBS grib_api
LIBS eccodes
)
list( APPEND ptools p_${tool} )
endforeach()

10
fortran/CMakeLists.txt
View File

@ -36,14 +36,14 @@ if( EC_HAVE_FORTRAN )
COMMAND cat ${srcdir}/eccodes_f90_head.f90 ${srcdir}/${_long_int_interface_ec} ${srcdir}/${_sizet_int_interface_ec} ${srcdir}/eccodes_f90_tail.f90 > eccodes_f90.f90
DEPENDS eccodes_f90_head.f90 eccodes_f90_tail.f90 grib_kinds.h ${_long_int_interface_ec} ${_sizet_int_interface_ec} )
ecbuild_add_library( TARGET grib_api_f77
ecbuild_add_library( TARGET eccodes_f77
SOURCES grib_fortran.c grib_f77.c
LIBS grib_api )
LIBS eccodes )
ecbuild_add_library( TARGET grib_api_f90
ecbuild_add_library( TARGET eccodes_f90
SOURCES grib_fortran.c grib_f90.f90 eccodes_f90.f90 grib_kinds.h
GENERATED grib_f90.f90 eccodes_f90.f90
LIBS grib_api )
LIBS eccodes )
# Add the eccodes module file as well
#set(_eccodes_mod "${CMAKE_Fortran_MODULE_DIRECTORY}/eccodes.mod" )
@ -55,7 +55,7 @@ if( EC_HAVE_FORTRAN )
# #COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_Fortran_MODULE_DIRECTORY}/grib_api.mod" ${_eccodes_mod}
# COMMAND "/usr/bin/sh" "-c" "if test -f GRIB_API.mod; then ln -s GRIB_API.mod ECCODES.mod; fi"
# COMMAND "/usr/bin/sh" "-c" "if test -f grib_api.mod; then ln -s grib_api.mod eccodes.mod; fi"
# DEPENDS grib_api_f90
# DEPENDS eccodes_f90
# VERBATIM
#)
#add_custom_target(add_eccodes_mod ALL DEPENDS ${_eccodes_mod})

2
python/CMakeLists.txt
View File

@ -66,7 +66,7 @@ if( HAVE_PYTHON )
TYPE SHARED
NOINSTALL
SOURCES grib_interface.h grib_interface.c ${_swig_c_wrapper}
LIBS grib_api ${PYTHON_LIBRARIES} )
LIBS eccodes ${PYTHON_LIBRARIES} )
# Don't use the lib prefix. This is needed for the python case where a _modulename.so is generated
set_target_properties(_gribapi_swig PROPERTIES PREFIX "")

2
src/CMakeLists.txt
View File

@ -376,7 +376,7 @@ ecbuild_generate_yy(YYPREFIX grib_yy
YACC_FLAGS "-y"
DEPENDANT action.c )
ecbuild_add_library(TARGET grib_api
ecbuild_add_library(TARGET eccodes
SOURCES grib_api_version.c
griby.c gribl.c
${grib_api_srcs}

2
tests/CMakeLists.txt
View File

@ -20,7 +20,7 @@ foreach( tool ${test_bins} )
ecbuild_add_executable( TARGET ${tool}
NOINSTALL
SOURCES ${tool}.c
LIBS grib_api
LIBS eccodes
)
endforeach()

8
tigge/CMakeLists.txt
View File

@ -2,24 +2,24 @@
ecbuild_add_executable(TARGET tigge_check
SOURCES tigge_check.c
INCLUDES ${GRIB_API_EXTRA_INCLUDE_DIRS}
LIBS grib_api
LIBS eccodes
)
ecbuild_add_executable(TARGET tigge_name
SOURCES tigge_name.c
INCLUDES ${GRIB_API_EXTRA_INCLUDE_DIRS}
LIBS grib_api
LIBS eccodes
)
ecbuild_add_executable(TARGET tigge_accumulations
SOURCES tigge_accumulations.c
INCLUDES ${GRIB_API_EXTRA_INCLUDE_DIRS}
LIBS grib_api
LIBS eccodes
)
ecbuild_add_executable(TARGET tigge_split
SOURCES tigge_split.c
INCLUDES ${GRIB_API_EXTRA_INCLUDE_DIRS}
LIBS grib_api
LIBS eccodes
)

2
tools/CMakeLists.txt
View File

@ -3,7 +3,7 @@ ecbuild_add_library( TARGET grib_tools
TYPE STATIC
NOINSTALL
SOURCES grib_tools.c grib_options.c grib_tools.h
LIBS grib_api )
LIBS eccodes )
# tools binaries
list( APPEND grib_tools_bins