From 5c010a5a06dab716ad3ab99a76c62cdd861f57a6 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Thu, 13 Apr 2023 14:15:37 -0600 Subject: [PATCH] Update tags in CMakeLists.txt for Skylab v4 release --- CMakeLists.txt | 49 +++++++++++++++++++------------------------------ 1 file changed, 19 insertions(+), 30 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e8ba52e..203a312 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 3.0.0 LANGUAGES C CXX Fortran ) +project( jedi-bundle VERSION 4.0.0 LANGUAGES C CXX Fortran ) list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") @@ -28,35 +28,24 @@ 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 ) -else() - ecbuild_bundle( PROJECT jedicmake GIT "https://github.com/jcsda/jedi-cmake.git" BRANCH develop UPDATE RECURSIVE ) - include( jedicmake/cmake/Functions/git_functions.cmake ) -endif() - -#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.31.1 ) - -ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" BRANCH develop UPDATE ) -ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" BRANCH develop UPDATE ) -ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" BRANCH develop UPDATE ) - -#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" BRANCH develop UPDATE ) -ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" BRANCH develop UPDATE ) -ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" BRANCH develop UPDATE ) - -#ecbuild_bundle( PROJECT fms GIT "https://github.com/jcsda/FMS.git" BRANCH release-stable UPDATE ) -ecbuild_bundle( PROJECT fv3 GIT "https://github.com/jcsda/GFDL_atmos_cubed_sphere.git" BRANCH release-stable UPDATE ) -ecbuild_bundle( PROJECT femps GIT "https://github.com/jcsda/femps.git" BRANCH develop UPDATE ) -ecbuild_bundle( PROJECT fv3-jedi-lm GIT "https://github.com/jcsda/fv3-jedi-linearmodel.git" BRANCH develop UPDATE ) -ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda/fv3-jedi.git" BRANCH develop UPDATE ) - -ecbuild_bundle( PROJECT mom6 GIT "https://github.com/jcsda/MOM6.git" BRANCH main-ecbuild UPDATE RECURSIVE ) -ecbuild_bundle( PROJECT soca GIT "https://github.com/jcsda/soca.git" BRANCH develop UPDATE ) +# Always use external jedi-cmake or build in bundle +include( $ENV{jedi_cmake_ROOT}/share/jedicmake/Functions/git_functions.cmake ) + +ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG 1.6.0 ) +ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG 1.3.0 ) +ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG 1.6.0 ) + +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.5.0 ) +ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG 1.6.0 ) + +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.5.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.4.0 ) ecbuild_bundle_finalize()