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

Rebranding: cmake config etc

This commit is contained in:
Shahram Najm 2015-02-18 18:11:38 +00:00
parent 85a253f2da
commit a38de835c2
13 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -197,11 +197,11 @@ endif()
ecbuild_generate_config_headers()
configure_file( grib_api_config.h.in grib_api_config.h )
configure_file( eccodes_config.h.in eccodes_config.h )
add_definitions( -DHAVE_GRIB_API_CONFIG_H )
add_definitions( -DHAVE_ECCODES_CONFIG_H )
install( FILES ${CMAKE_CURRENT_BINARY_DIR}/grib_api_config.h DESTINATION ${INSTALL_INCLUDE_DIR} )
install( FILES ${CMAKE_CURRENT_BINARY_DIR}/eccodes_config.h DESTINATION ${INSTALL_INCLUDE_DIR} )
if( CMAKE_COMPILER_IS_GNUCC )
cmake_add_c_flags("-pedantic")

2
Makefile.am
View File

@ -376,7 +376,7 @@ EXTRA_DIST = README AUTHORS NOTICE LICENSE ChangeLog version.sh html \
CMakeLists.txt \
project_summary.cmake \
VERSION.cmake \
grib_api_config.h.in \
eccodes_config.h.in \
examples/CMakeLists.txt \
data/CMakeLists.txt \
data/tigge/CMakeLists.txt \

6
grib_api_config.h.in → eccodes_config.h.in
View File

@ -8,8 +8,8 @@
* virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
*/
#ifndef grib_api_config_h
#define grib_api_config_h
#ifndef eccodes_config_h
#define eccodes_config_h
#include "eccodes_ecbuild_config.h" /* generated by ecbuild */
@ -95,4 +95,4 @@
#cmakedefine HAVE_NETCDF
#endif /* grib_api_config_h */
#endif /* eccodes_config_h */

2
ifs_samples/grib1/CMakeLists.txt
View File

@ -7,7 +7,7 @@ list( APPEND ifs_samples_${_basedir}
sh_sfc.tmpl
)
install( FILES ${GRIB_API_SAMPLES_FILES} ${ifs_samples_${_basedir}}
install( FILES ${ECCODES_SAMPLES_FILES} ${ifs_samples_${_basedir}}
DESTINATION ${ECCODES_IFS_SAMPLES_PATH}/${_basedir}
PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ )

2
ifs_samples/grib1_mlgrib2/CMakeLists.txt
View File

@ -7,7 +7,7 @@ list( APPEND ifs_samples_${_basedir}
sh_sfc.tmpl
)
install( FILES ${GRIB_API_SAMPLES_FILES} ${ifs_samples_${_basedir}}
install( FILES ${ECCODES_SAMPLES_FILES} ${ifs_samples_${_basedir}}
DESTINATION ${ECCODES_IFS_SAMPLES_PATH}/${_basedir}
PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ )

2
ifs_samples/grib1_mlgrib2_ieee32/CMakeLists.txt
View File

@ -7,7 +7,7 @@ list( APPEND ifs_samples_${_basedir}
sh_sfc.tmpl
)
install( FILES ${GRIB_API_SAMPLES_FILES} ${ifs_samples_${_basedir}}
install( FILES ${ECCODES_SAMPLES_FILES} ${ifs_samples_${_basedir}}
DESTINATION ${ECCODES_IFS_SAMPLES_PATH}/${_basedir}
PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ )

2
ifs_samples/grib1_mlgrib2_ieee64/CMakeLists.txt
View File

@ -7,7 +7,7 @@ list( APPEND ifs_samples_${_basedir}
sh_sfc.tmpl
)
install( FILES ${GRIB_API_SAMPLES_FILES} ${ifs_samples_${_basedir}}
install( FILES ${ECCODES_SAMPLES_FILES} ${ifs_samples_${_basedir}}
DESTINATION ${ECCODES_IFS_SAMPLES_PATH}/${_basedir}
PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ )

6
samples/CMakeLists.txt
View File

@ -5,11 +5,11 @@ install( FILES ${samples_files}
PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ )
foreach( tmpl ${samples_files} )
list( APPEND GRIB_API_SAMPLES_FILES ${CMAKE_CURRENT_SOURCE_DIR}/${tmpl} )
list( APPEND ECCODES_SAMPLES_FILES ${CMAKE_CURRENT_SOURCE_DIR}/${tmpl} )
endforeach()
set( GRIB_API_SAMPLES_DIR ${CMAKE_CURRENT_SOURCE_DIR} PARENT_SCOPE )
set( GRIB_API_SAMPLES_FILES ${GRIB_API_SAMPLES_FILES} PARENT_SCOPE )
set( ECCODES_SAMPLES_DIR ${CMAKE_CURRENT_SOURCE_DIR} PARENT_SCOPE )
set( ECCODES_SAMPLES_FILES ${ECCODES_SAMPLES_FILES} PARENT_SCOPE )
# copy the samples to the build directory

4
src/grib_api_internal.h
View File

@ -22,8 +22,8 @@ extern "C" {
#endif
/* cmake config header */
#ifdef HAVE_GRIB_API_CONFIG_H
#include "grib_api_config.h"
#ifdef HAVE_ECCODES_CONFIG_H
#include "eccodes_config.h"
#endif
/* autoconf config header */

4
tigge/tigge_accumulations.c
View File

@ -9,8 +9,8 @@
*/
/* cmake config header */
#ifdef HAVE_GRIB_API_CONFIG_H
#include "grib_api_config.h"
#ifdef HAVE_ECCODES_CONFIG_H
#include "eccodes_config.h"
#endif
/* autoconf config header */

4
tigge/tigge_check.c
View File

@ -9,8 +9,8 @@
*/
/* cmake config header */
#ifdef HAVE_GRIB_API_CONFIG_H
#include "grib_api_config.h"
#ifdef HAVE_ECCODES_CONFIG_H
#include "eccodes_config.h"
#endif
/* autoconf config header */

4
tigge/tigge_name.c
View File

@ -9,8 +9,8 @@
*/
/* cmake config header */
#ifdef HAVE_GRIB_API_CONFIG_H
#include "grib_api_config.h"
#ifdef HAVE_ECCODES_CONFIG_H
#include "eccodes_config.h"
#endif
/* autoconf config header */

4
tigge/tigge_split.c
View File

@ -9,8 +9,8 @@
*/
/* cmake config header */
#ifdef HAVE_GRIB_API_CONFIG_H
#include "grib_api_config.h"
#ifdef HAVE_ECCODES_CONFIG_H
#include "eccodes_config.h"
#endif
/* autoconf config header */