diff options
| author | Sergey Kosukhin <skosukhin@gmail.com> | 2017-12-08 09:34:37 +0100 |
|---|---|---|
| committer | Massimiliano Culpo <massimiliano.culpo@gmail.com> | 2017-12-08 09:34:37 +0100 |
| commit | a593553d48e51c67cdcde73c07c9ce0babb2e647 (patch) | |
| tree | 9f8e56bd065edc4bec381306897d62402aea8ed5 /var/spack/repos/builtin/packages/eccodes/enable_only_jasper.patch | |
| parent | a110a86ad6772e942328d3481aaff4950a3aeba3 (diff) | |
| download | spack-a593553d48e51c67cdcde73c07c9ce0babb2e647.tar.gz spack-a593553d48e51c67cdcde73c07c9ce0babb2e647.tar.bz2 spack-a593553d48e51c67cdcde73c07c9ce0babb2e647.tar.xz spack-a593553d48e51c67cdcde73c07c9ce0babb2e647.zip | |
Update for 'eccodes'. (#6604)
Diffstat (limited to 'var/spack/repos/builtin/packages/eccodes/enable_only_jasper.patch')
| -rw-r--r-- | var/spack/repos/builtin/packages/eccodes/enable_only_jasper.patch | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/var/spack/repos/builtin/packages/eccodes/enable_only_jasper.patch b/var/spack/repos/builtin/packages/eccodes/enable_only_jasper.patch index 9f7dc22ac5..ad09c75199 100644 --- a/var/spack/repos/builtin/packages/eccodes/enable_only_jasper.patch +++ b/var/spack/repos/builtin/packages/eccodes/enable_only_jasper.patch @@ -1,17 +1,25 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index bf4d78b..ea2f3e9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -162,8 +162,6 @@ if( ENABLE_JPG ) - set(CMAKE_PREFIX_PATH ${_CMAKE_PREFIX_PATH}) # Restore CMAKE_PREFIX_PATH - set(CMAKE_WARN_DEPRECATED ON) # Remove suppression +@@ -151,18 +151,7 @@ set( HAVE_LIBOPENJPEG 0 ) -- find_package( OpenJPEG ) + if( ENABLE_JPG ) + +- # Note: This is a deprecated feature but we need it to find Jasper at ECMWF. +- # ecbuild_add_extra_search_paths modifies CMAKE_PREFIX_PATH +- # which can affect future package discovery if not undone by the caller. +- # The current CMAKE_PREFIX_PATH is backed up as _CMAKE_PREFIX_PATH +- # +- set(CMAKE_WARN_DEPRECATED OFF) # Suppress deprecation message +- ecbuild_add_extra_search_paths( jasper ) + find_package( Jasper ) +- set(CMAKE_PREFIX_PATH ${_CMAKE_PREFIX_PATH}) # Restore CMAKE_PREFIX_PATH +- set(CMAKE_WARN_DEPRECATED ON) # Remove suppression - +- find_package( OpenJPEG ) + if( JASPER_FOUND ) list( APPEND ECCODES_TPLS Jasper ) - set( HAVE_JPEG 1 ) -@@ -172,12 +170,6 @@ if( ENABLE_JPG ) +@@ -172,12 +161,6 @@ if( ENABLE_JPG ) string(REGEX REPLACE "^([0-9]+)\\.[0-9]+\\.[0-9]+.*" "\\1" JASPER_VERSION_MAJOR "${JASPER_VERSION_STRING}") endif() |