Skip to content

Commit

Permalink
Merge branch 'develop' into as_bitmap
Browse files Browse the repository at this point in the history
  • Loading branch information
AlysonStahl-NOAA authored Dec 3, 2024
2 parents 420d1da + 18074e3 commit 794d36d
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
3 changes: 2 additions & 1 deletion .github/workflows/Linux_versions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ jobs:
jasper-version: [2.0.33, 4.0.0]
bacio-version: [2.4.1, 2.6.0]
w3emc-version: [2.9.2, 2.10.0]
ip-version: [develop, v5.0.0]
g2c-version: [develop, v2.0.0]
build-utils: [ON, OFF]
exclude:
Expand Down Expand Up @@ -64,7 +65,7 @@ jobs:
g2c-cmake-args: -DENABLE_SHARED=ON
w3emc-version: v${{ matrix.w3emc-version }}
w3emc-cmake-args: -DBUILD_WITH_BUFR=OFF
ip-version: develop
ip-version: ${{ matrix.ip-version }}
key-suffix: -gcc${{ matrix.gcc-version }}

- name: checkout
Expand Down
5 changes: 5 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,11 @@ if (BUILD_WITH_W3EMC)
endif()
endif()

# We need g2c if G2C_COMPARE is chosen.
if (G2C_COMPARE)
find_package(g2c 1.7.0 REQUIRED)
endif()

# Figure whether user wants a _4, a _d, or both libraries.
if(BUILD_4 AND BUILD_D)
set(kinds "4" "d")
Expand Down

0 comments on commit 794d36d

Please sign in to comment.