Skip to content

Commit

Permalink
Remove jpeg
Browse files Browse the repository at this point in the history
  • Loading branch information
DusanJovic-NOAA committed Mar 23, 2024
1 parent 2a063bb commit 897a7bd
Showing 1 changed file with 1 addition and 19 deletions.
20 changes: 1 addition & 19 deletions libs/ufslibs/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -67,23 +67,6 @@ ExternalProject_Add(zlib
LOG_INSTALL ON
)

##
## jpeg
##
ExternalProject_Add(jpeg
URL https://github.com/libjpeg-turbo/libjpeg-turbo/archive/refs/tags/2.1.4.tar.gz
URL_HASH MD5=357dc26a802c34387512a42697846d16
BUILD_IN_SOURCE OFF
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${install_prefix}/jpeg
-DCMAKE_INSTALL_DEFAULT_LIBDIR=lib
-DENABLE_STATIC=ON
-DENABLE_SHARED=OFF
LOG_DOWNLOAD ON
LOG_CONFIGURE ON
LOG_BUILD ON
LOG_INSTALL ON
)

##
## jasper
##
Expand All @@ -106,7 +89,6 @@ ExternalProject_Add(jasper
LOG_BUILD ON
LOG_INSTALL ON
)
ExternalProject_Add_StepDependencies(jasper build jpeg)

##
## libpng
Expand Down Expand Up @@ -423,7 +405,7 @@ foreach(lib_name
LIST_SEPARATOR ,
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${install_prefix}/${lib_name}
-DCMAKE_INSTALL_LIBDIR=lib
-DCMAKE_PREFIX_PATH=${install_prefix}/netcdf,${install_prefix}/jpeg,${install_prefix}/jasper,${install_prefix}/libpng,${install_prefix}/zlib
-DCMAKE_PREFIX_PATH=${install_prefix}/netcdf,${install_prefix}/jasper,${install_prefix}/libpng,${install_prefix}/zlib
-Dbacio_ROOT=${install_prefix}/NCEPLIBS-bacio
-Dg2_ROOT=${install_prefix}/NCEPLIBS-g2
-Dg2tmpl_ROOT=${install_prefix}/NCEPLIBS-g2tmpl
Expand Down

0 comments on commit 897a7bd

Please sign in to comment.