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

Fixes for GRIB-826 and GRIB-825

This commit is contained in:
Shahram Najm 2015-09-18 11:07:02 +01:00
parent 05bdf8761e
commit b2bea8c33b
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -14,7 +14,7 @@ set( CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH}
include( ecbuild_system NO_POLICY_SCOPE ) include( ecbuild_system NO_POLICY_SCOPE )
ecbuild_requires_macro_version( 1.7 ) ecbuild_requires_macro_version( 1.9 )
############################################################################### ###############################################################################
# local project # local project
@ -62,7 +62,7 @@ ecbuild_add_option( FEATURE AEC
ecbuild_add_option( FEATURE PYTHON ecbuild_add_option( FEATURE PYTHON
DESCRIPTION "build the ecCodes Python interface" DESCRIPTION "build the ecCodes Python interface"
DEFAULT ON DEFAULT ON
# REQUIRED_LANGUAGES Python # TODO REQUIRED_PACKAGES Python
) )
ecbuild_add_option( FEATURE FORTRAN ecbuild_add_option( FEATURE FORTRAN
@ -96,6 +96,7 @@ set( ECCODES_EXTRA_INCLUDE_DIRS "" )
set( ECCODES_EXTRA_DEFINITIONS "" ) set( ECCODES_EXTRA_DEFINITIONS "" )
find_package( CMath ) find_package( CMath )
list( APPEND ECCODES_TPLS CMath )
### JPG support ### JPG support
@ -111,11 +112,13 @@ if( ENABLE_JPG )
find_package( OpenJPEG ) find_package( OpenJPEG )
if( JASPER_FOUND ) if( JASPER_FOUND )
list( APPEND ECCODES_TPLS Jasper )
set( HAVE_JPEG 1 ) set( HAVE_JPEG 1 )
set( HAVE_LIBJASPER 1 ) set( HAVE_LIBJASPER 1 )
endif() endif()
if( OPENJPEG_FOUND ) if( OPENJPEG_FOUND )
list( APPEND ECCODES_TPLS OpenJPEG )
set( HAVE_JPEG 1 ) set( HAVE_JPEG 1 )
set( HAVE_LIBOPENJPEG 1 ) set( HAVE_LIBOPENJPEG 1 )
endif() endif()
@ -224,7 +227,6 @@ endif()
### export package to other ecbuild packages ### export package to other ecbuild packages
set( ECCODES_TPLS AEC PNG Jasper OpenJPEG CMath )
set( ECCODES_INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_BINARY_DIR}/src ) set( ECCODES_INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_BINARY_DIR}/src )
set( ECCODES_LIBRARIES eccodes ) set( ECCODES_LIBRARIES eccodes )