From 5f231561e4e75699c42f6f50a4db10752b9098d7 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Tue, 27 Dec 2022 16:47:30 -0700 Subject: [PATCH] Update develop branch of jedi-bundle public to match internal version --- .gitignore | 6 ++++++ CMakeLists.txt | 29 ++++++++++++++++++----------- README.md | 2 -- 3 files changed, 24 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index d85387c..4800957 100644 --- a/.gitignore +++ b/.gitignore @@ -60,6 +60,12 @@ ioda-data/ ufo-data/ saber-data/ +solo/ +ewok/ +r2d2/ +r2d2-data/ +simobs/ + Testing/ diff --git a/CMakeLists.txt b/CMakeLists.txt index 65473b2..95ac50f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,7 +5,7 @@ cmake_minimum_required( VERSION 3.12 FATAL_ERROR ) find_package( ecbuild 3.6 REQUIRED HINTS ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../ecbuild) -project( jedi-bundle VERSION 2.0.0 LANGUAGES C CXX Fortran ) +project( jedi-bundle VERSION 3.0.0 LANGUAGES C CXX Fortran ) list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") @@ -21,6 +21,13 @@ set( ENABLE_OMP ON CACHE BOOL "Compile with OpenMP" ) # Define bundle ecbuild_bundle_initialize() +# add the automatically determined parts of the RPATH +# which point to directories outside the build tree to the install RPATH +set(CMAKE_INSTALL_RPATH_USE_LINK_PATH ON) + +# when building, already use the install RPATH +set(CMAKE_BUILD_WITH_INSTALL_RPATH ON) + # Use external jedi-cmake or build in bundle if(DEFINED ENV{jedi_cmake_ROOT}) include( $ENV{jedi_cmake_ROOT}/share/jedicmake/Functions/git_functions.cmake ) @@ -29,27 +36,27 @@ else() include( jedicmake/cmake/Functions/git_functions.cmake ) endif() -#ecbuild_bundle( PROJECT eckit GIT "https://github.com/ecmwf/eckit.git" TAG 1.19.0 ) +#ecbuild_bundle( PROJECT eckit GIT "https://github.com/ecmwf/eckit.git" TAG 1.20.2 ) #ecbuild_bundle( PROJECT fckit GIT "https://github.com/ecmwf/fckit.git" TAG 0.9.5 ) -#ecbuild_bundle( PROJECT atlas GIT "https://github.com/ecmwf/atlas.git" TAG 0.30.0 ) +#ecbuild_bundle( PROJECT atlas GIT "https://github.com/ecmwf/atlas.git" TAG 0.31.1 ) -ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG 1.4.0 ) -ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG 1.1.0 ) -ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG 1.4.0 ) +ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG 1.5.0 ) +ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG 1.2.0 ) +ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG 1.5.0 ) -#ecbuild_bundle( PROJECT crtm GIT "https://github.com/jcsda/crtm.git" TAG v2.4-jedi ) +#ecbuild_bundle( PROJECT crtm GIT "https://github.com/jcsda/crtm.git" TAG v2.4-jedi.2 ) ecbuild_bundle( PROJECT gsw GIT "https://github.com/jcsda/GSW-Fortran.git" TAG v3.07 ) -ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG 2.3.0 ) -ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG 1.4.0 ) +ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG 2.4.0 ) +ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG 1.5.0 ) #ecbuild_bundle( PROJECT fms GIT "https://github.com/jcsda/FMS.git" TAG 1.2.0.jcsda ) ecbuild_bundle( PROJECT fv3 GIT "https://github.com/jcsda/GFDL_atmos_cubed_sphere.git" TAG 1.2.0.jcsda ) ecbuild_bundle( PROJECT femps GIT "https://github.com/jcsda/femps.git" TAG 1.2.0 ) ecbuild_bundle( PROJECT fv3-jedi-lm GIT "https://github.com/jcsda/fv3-jedi-linearmodel.git" TAG 1.2.0 ) -ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda/fv3-jedi.git" TAG 1.3.0 ) +ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda/fv3-jedi.git" TAG 1.4.0 ) ecbuild_bundle( PROJECT mom6 GIT "https://github.com/jcsda/MOM6.git" TAG 2022.1.0 RECURSIVE ) -ecbuild_bundle( PROJECT soca GIT "https://github.com/jcsda/soca.git" TAG 1.2.0 ) +ecbuild_bundle( PROJECT soca GIT "https://github.com/jcsda/soca.git" TAG 1.3.0 ) ecbuild_bundle_finalize() diff --git a/README.md b/README.md index 65de158..04bdf31 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,3 @@ -# Note - as of Nov 7, 2022, the main branch of this repository is frozen. The develop branch is used for all releases and all developments. - ### License: (C) Copyright 2017-2022 UCAR