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

Renamed some cmake variables

This commit is contained in:
Shahram Najm 2015-01-26 22:28:46 +00:00
parent d4bb01d797
commit 4a097bb807
5 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
CMakeLists.txt
View File

@ -6,9 +6,6 @@
# #
# -DCMAKE_MODULE_PATH=/path/to/ecbuild/cmake # -DCMAKE_MODULE_PATH=/path/to/ecbuild/cmake
# TODO:
# * build python bindings
cmake_minimum_required( VERSION 2.8.4 FATAL_ERROR ) cmake_minimum_required( VERSION 2.8.4 FATAL_ERROR )
project( grib_api C ) project( grib_api C )
@ -178,11 +175,11 @@ endif()
if( NOT DEFINED ECCODES_DEFINITION_PATH ) if( NOT DEFINED ECCODES_DEFINITION_PATH )
set( ECCODES_DEFINITION_PATH ${grib_api_default_data_prefix}/share/grib_api/definitions ) set( ECCODES_DEFINITION_PATH ${grib_api_default_data_prefix}/share/grib_api/definitions )
endif() endif()
if( NOT DEFINED GRIB_API_SAMPLES_PATH ) if( NOT DEFINED ECCODES_SAMPLES_PATH )
set( GRIB_API_SAMPLES_PATH ${grib_api_default_data_prefix}/share/grib_api/samples ) set( ECCODES_SAMPLES_PATH ${grib_api_default_data_prefix}/share/grib_api/samples )
endif() endif()
if( NOT DEFINED GRIB_API_IFS_SAMPLES_PATH ) if( NOT DEFINED ECCODES_IFS_SAMPLES_PATH )
set( GRIB_API_IFS_SAMPLES_PATH ${grib_api_default_data_prefix}/share/grib_api/ifs_samples ) set( ECCODES_IFS_SAMPLES_PATH ${grib_api_default_data_prefix}/share/grib_api/ifs_samples )
endif() endif()
### config header ### config header
@ -208,7 +205,7 @@ set( GRIB_API_TPLS AEC PNG NetCDF 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_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 grib_api )
get_directory_property( COMPILE_DEFINITIONS GRIB_API_DEFINITIONS ) get_directory_property( COMPILE_DEFINITIONS ECCODES_DEFINITIONS )
foreach( _tpl ${GRIB_API_TPLS} ) foreach( _tpl ${GRIB_API_TPLS} )
string( TOUPPER ${_tpl} TPL ) string( TOUPPER ${_tpl} TPL )
@ -259,12 +256,12 @@ if( EC_HAVE_FORTRAN )
endif() endif()
if( NOT ${PROJECT_NAME} STREQUAL ${CMAKE_PROJECT_NAME} ) if( NOT ${PROJECT_NAME} STREQUAL ${CMAKE_PROJECT_NAME} )
set( GRIB_API_DEFINITIONS ${GRIB_API_DEFINITIONS} PARENT_SCOPE )# includes already TPL definitions set( ECCODES_DEFINITIONS ${ECCODES_DEFINITIONS} PARENT_SCOPE )# includes already TPL definitions
set( GRIB_API_INCLUDE_DIRS ${GRIB_API_INCLUDE_DIRS} ${GRIB_API_EXTRA_INCLUDE_DIRS} PARENT_SCOPE ) set( GRIB_API_INCLUDE_DIRS ${GRIB_API_INCLUDE_DIRS} ${GRIB_API_EXTRA_INCLUDE_DIRS} PARENT_SCOPE )
set( GRIB_API_LIBRARIES ${GRIB_API_LIBRARIES} ${GRIB_API_EXTRA_LIBRARIES} ${CMATH_LIBRARIES} PARENT_SCOPE ) set( GRIB_API_LIBRARIES ${GRIB_API_LIBRARIES} ${GRIB_API_EXTRA_LIBRARIES} ${CMATH_LIBRARIES} PARENT_SCOPE )
set( GRIB_API_FOUND TRUE PARENT_SCOPE ) set( ECCODES_FOUND TRUE PARENT_SCOPE )
set( GRIB_API_SAMPLES_PATH ${GRIB_API_SAMPLES_PATH} PARENT_SCOPE ) set( ECCODES_SAMPLES_PATH ${ECCODES_SAMPLES_PATH} PARENT_SCOPE )
set( GRIB_API_IFS_SAMPLES_PATH ${GRIB_API_IFS_SAMPLES_PATH} PARENT_SCOPE ) set( ECCODES_IFS_SAMPLES_PATH ${ECCODES_IFS_SAMPLES_PATH} PARENT_SCOPE )
set( ECCODES_DEFINITION_PATH ${ECCODES_DEFINITION_PATH} PARENT_SCOPE ) set( ECCODES_DEFINITION_PATH ${ECCODES_DEFINITION_PATH} PARENT_SCOPE )
set( ECCODES_INSTALL_ECMWF_TOOLS ${ECCODES_INSTALL_ECMWF_TOOLS} PARENT_SCOPE ) set( ECCODES_INSTALL_ECMWF_TOOLS ${ECCODES_INSTALL_ECMWF_TOOLS} PARENT_SCOPE )
endif() endif()

2
ifs_samples/grib1/CMakeLists.txt
View File

@ -8,7 +8,7 @@ list( APPEND ifs_samples_${_basedir}
) )
install( FILES ${GRIB_API_SAMPLES_FILES} ${ifs_samples_${_basedir}} install( FILES ${GRIB_API_SAMPLES_FILES} ${ifs_samples_${_basedir}}
DESTINATION ${GRIB_API_IFS_SAMPLES_PATH}/${_basedir} DESTINATION ${ECCODES_IFS_SAMPLES_PATH}/${_basedir}
PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ ) PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ )
file( COPY ${ifs_samples_${_basedir}} file( COPY ${ifs_samples_${_basedir}}

2
ifs_samples/grib1_mlgrib2/CMakeLists.txt
View File

@ -8,7 +8,7 @@ list( APPEND ifs_samples_${_basedir}
) )
install( FILES ${GRIB_API_SAMPLES_FILES} ${ifs_samples_${_basedir}} install( FILES ${GRIB_API_SAMPLES_FILES} ${ifs_samples_${_basedir}}
DESTINATION ${GRIB_API_IFS_SAMPLES_PATH}/${_basedir} DESTINATION ${ECCODES_IFS_SAMPLES_PATH}/${_basedir}
PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ ) PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ )
file( COPY ${ifs_samples_${_basedir}} file( COPY ${ifs_samples_${_basedir}}

2
ifs_samples/grib1_mlgrib2_ieee32/CMakeLists.txt
View File

@ -8,7 +8,7 @@ list( APPEND ifs_samples_${_basedir}
) )
install( FILES ${GRIB_API_SAMPLES_FILES} ${ifs_samples_${_basedir}} install( FILES ${GRIB_API_SAMPLES_FILES} ${ifs_samples_${_basedir}}
DESTINATION ${GRIB_API_IFS_SAMPLES_PATH}/${_basedir} DESTINATION ${ECCODES_IFS_SAMPLES_PATH}/${_basedir}
PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ ) PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ )
file( COPY ${ifs_samples_${_basedir}} file( COPY ${ifs_samples_${_basedir}}

2
ifs_samples/grib1_mlgrib2_ieee64/CMakeLists.txt
View File

@ -8,7 +8,7 @@ list( APPEND ifs_samples_${_basedir}
) )
install( FILES ${GRIB_API_SAMPLES_FILES} ${ifs_samples_${_basedir}} install( FILES ${GRIB_API_SAMPLES_FILES} ${ifs_samples_${_basedir}}
DESTINATION ${GRIB_API_IFS_SAMPLES_PATH}/${_basedir} DESTINATION ${ECCODES_IFS_SAMPLES_PATH}/${_basedir}
PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ ) PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ )
file( COPY ${ifs_samples_${_basedir}} file( COPY ${ifs_samples_${_basedir}}