Skip to content

Commit ff6fe94

Browse files
Remove 'NCEPLIBS-' prefix from nceplibs libraries
1 parent e0de16b commit ff6fe94

File tree

2 files changed

+46
-47
lines changed

2 files changed

+46
-47
lines changed

build.sh

+10-10
Original file line numberDiff line numberDiff line change
@@ -142,18 +142,18 @@ export PIO_ROOT=${ufslibs_install_prefix}/pio
142142
export ESMFMKFILE=${ufslibs_install_prefix}/esmf/lib/esmf.mk
143143
export FMS_ROOT=${ufslibs_install_prefix}/fms
144144

145-
export bacio_ROOT=${ufslibs_install_prefix}/NCEPLIBS-bacio
145+
export bacio_ROOT=${ufslibs_install_prefix}/bacio
146146
export crtm_ROOT=${ufslibs_install_prefix}/crtm
147-
export g2_ROOT=${ufslibs_install_prefix}/NCEPLIBS-g2
148-
export g2tmpl_ROOT=${ufslibs_install_prefix}/NCEPLIBS-g2tmpl
149-
export gfsio_ROOT=${ufslibs_install_prefix}/NCEPLIBS-gfsio
150-
export ip_ROOT=${ufslibs_install_prefix}/NCEPLIBS-ip
151-
export nemsio_ROOT=${ufslibs_install_prefix}/NCEPLIBS-nemsio
152-
export sfcio_ROOT=${ufslibs_install_prefix}/NCEPLIBS-sfcio
153-
export sigio_ROOT=${ufslibs_install_prefix}/NCEPLIBS-sigio
154-
export sp_ROOT=${ufslibs_install_prefix}/NCEPLIBS-sp
147+
export g2_ROOT=${ufslibs_install_prefix}/g2
148+
export g2tmpl_ROOT=${ufslibs_install_prefix}/g2tmpl
149+
export gfsio_ROOT=${ufslibs_install_prefix}/gfsio
150+
export ip_ROOT=${ufslibs_install_prefix}/ip
151+
export nemsio_ROOT=${ufslibs_install_prefix}/nemsio
152+
export sfcio_ROOT=${ufslibs_install_prefix}/sfcio
153+
export sigio_ROOT=${ufslibs_install_prefix}/sigio
154+
export sp_ROOT=${ufslibs_install_prefix}/sp
155155
export upp_ROOT=${ufslibs_install_prefix}/UPP
156-
export w3emc_ROOT=${ufslibs_install_prefix}/NCEPLIBS-w3emc
156+
export w3emc_ROOT=${ufslibs_install_prefix}/w3emc
157157

158158
export GFTL_ROOT=${ufslibs_install_prefix}/gftl_shared
159159
export GFTL_SHARED_ROOT=${ufslibs_install_prefix}/gftl_shared

libs/ufslibs/CMakeLists.txt

+36-37
Original file line numberDiff line numberDiff line change
@@ -373,50 +373,49 @@ ExternalProject_Add_StepDependencies(esmf build netcdf_fortran pio)
373373
##
374374
## NCEPLIBS
375375
##
376-
set(NCEPLIBS-bacio_tag v2.4.1)
377-
set(NCEPLIBS-g2_tag v3.4.5)
378-
set(NCEPLIBS-g2tmpl_tag v1.10.2)
379-
set(NCEPLIBS-gfsio_tag v1.4.1)
380-
set(NCEPLIBS-ip_tag v4.3.0)
381-
set(NCEPLIBS-nemsio_tag v2.5.4)
382-
set(NCEPLIBS-sfcio_tag v1.4.1)
383-
set(NCEPLIBS-sigio_tag v2.3.2)
384-
set(NCEPLIBS-sp_tag v2.3.3)
385-
set(NCEPLIBS-w3emc_tag v2.10.0)
376+
set(bacio_tag 2.4.1)
377+
set(g2_tag 3.4.5)
378+
set(g2tmpl_tag 1.10.2)
379+
set(gfsio_tag 1.4.1)
380+
set(ip_tag 4.3.0)
381+
set(nemsio_tag 2.5.4)
382+
set(sfcio_tag 1.4.1)
383+
set(sigio_tag 2.3.2)
384+
set(sp_tag 2.3.3)
385+
set(w3emc_tag 2.10.0)
386386

387387
foreach(lib_name
388-
NCEPLIBS-bacio
389-
NCEPLIBS-g2
390-
NCEPLIBS-g2tmpl
391-
NCEPLIBS-gfsio
392-
NCEPLIBS-ip
393-
NCEPLIBS-nemsio
394-
NCEPLIBS-sfcio
395-
NCEPLIBS-sigio
396-
NCEPLIBS-sp
397-
NCEPLIBS-w3emc)
388+
bacio
389+
g2
390+
g2tmpl
391+
gfsio
392+
ip
393+
nemsio
394+
sfcio
395+
sigio
396+
sp
397+
w3emc)
398398

399399
ExternalProject_Add(${lib_name}
400-
GIT_REPOSITORY https://github.com/NOAA-EMC/${lib_name}
401-
GIT_TAG ${${lib_name}_tag}
400+
GIT_REPOSITORY https://github.com/NOAA-EMC/NCEPLIBS-${lib_name}
401+
GIT_TAG v${${lib_name}_tag}
402402
GIT_SUBMODULES_RECURSE ON
403403
UPDATE_COMMAND ""
404404
BUILD_IN_SOURCE OFF
405405
LIST_SEPARATOR ,
406406
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${install_prefix}/${lib_name}
407407
-DCMAKE_INSTALL_LIBDIR=lib
408408
-DCMAKE_PREFIX_PATH=${install_prefix}/netcdf,${install_prefix}/jasper,${install_prefix}/libpng,${install_prefix}/zlib
409-
-Dbacio_ROOT=${install_prefix}/NCEPLIBS-bacio
410-
-Dg2_ROOT=${install_prefix}/NCEPLIBS-g2
411-
-Dg2tmpl_ROOT=${install_prefix}/NCEPLIBS-g2tmpl
412-
-Dgfsio_ROOT=${install_prefix}/NCEPLIBS-gfsio
413-
-Dip_ROOT=${install_prefix}/NCEPLIBS-ip
414-
-Dnemsio_ROOT=${install_prefix}/NCEPLIBS-nemsio
415-
-Dsfcio_ROOT=${install_prefix}/NCEPLIBS-sfcio
416-
-Dsigio_ROOT=${install_prefix}/NCEPLIBS-sigio
417-
-Dsp_ROOT=${install_prefix}/NCEPLIBS-sp
418-
-Dw3nco_ROOT=${install_prefix}/NCEPLIBS-w3nco
419-
-Dw3emc_ROOT=${install_prefix}/NCEPLIBS-w3emc
409+
-Dbacio_ROOT=${install_prefix}/bacio
410+
-Dg2_ROOT=${install_prefix}/g2
411+
-Dg2tmpl_ROOT=${install_prefix}/g2tmpl
412+
-Dgfsio_ROOT=${install_prefix}/gfsio
413+
-Dip_ROOT=${install_prefix}/ip
414+
-Dnemsio_ROOT=${install_prefix}/nemsio
415+
-Dsfcio_ROOT=${install_prefix}/sfcio
416+
-Dsigio_ROOT=${install_prefix}/sigio
417+
-Dsp_ROOT=${install_prefix}/sp
418+
-Dw3emc_ROOT=${install_prefix}/w3emc
420419
-DBUILD_WITH_BUFR=OFF
421420
LOG_DOWNLOAD ON
422421
LOG_CONFIGURE ON
@@ -426,10 +425,10 @@ foreach(lib_name
426425

427426
endforeach()
428427

429-
ExternalProject_Add_StepDependencies(NCEPLIBS-g2 build jasper libpng)
430-
ExternalProject_Add_StepDependencies(NCEPLIBS-ip build NCEPLIBS-sp)
431-
ExternalProject_Add_StepDependencies(NCEPLIBS-nemsio build NCEPLIBS-bacio NCEPLIBS-w3emc)
432-
ExternalProject_Add_StepDependencies(NCEPLIBS-w3emc build NCEPLIBS-bacio)
428+
ExternalProject_Add_StepDependencies(g2 build jasper libpng)
429+
ExternalProject_Add_StepDependencies(ip build sp)
430+
ExternalProject_Add_StepDependencies(nemsio build bacio w3emc)
431+
ExternalProject_Add_StepDependencies(w3emc build bacio)
433432

434433
##
435434
## crtm

0 commit comments

Comments
 (0)