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

Checkin from Tiago: fixes for build system

This commit is contained in:
Shahram Najm 2013-09-18 08:53:52 +01:00
parent 1da030368f
commit e45107acbb
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -69,7 +69,9 @@ set( HAVE_LIBOPENJPEG 0 )
if( GRIB_API_JPG )
ecbuild_add_extra_search_paths( jasper ) # help standard cmake macro with ecmwf paths
find_package( Jasper )
find_package( OpenJPEG )
if( JASPER_FOUND )

4
python/CMakeLists.txt
View File

@ -1,6 +1,6 @@
if( GRIB_API_PYTHON )
ecbuild_find_python( VERSION 2.5 )
ecbuild_find_python( VERSION 2.5)
find_package( SWIG )
if( SWIG_FOUND )
@ -53,7 +53,7 @@ if( GRIB_API_PYTHON )
set( LIB_OPENJPEG ${HAVE_LIBOPENJPEG} )
get_filename_component(OPENJPEG_DIR ${OPENJPEG_INCLUDE_DIR} PATH )
include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} )
include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${PYTHON_INCLUDE_DIRS} )
configure_file( setup.py.in setup.py )