Skip to content

Commit

Permalink
Merge pull request #197 from NOAA-EMC/ejh_options
Browse files Browse the repository at this point in the history
change default options
  • Loading branch information
edwardhartnett authored Sep 26, 2023
2 parents 063d7bc + fa9bbe5 commit 624f1e6
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/Linux_options.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
CC: gcc-11
strategy:
matrix:
options: [-DBUILD_D=OFF, -DBUILD_4=OFF, '-DBUILD_SHARED_LIBS=ON -DBUILD_WITH_BUFR=OFF -DBUILD_WITH_EXTRA_DEPS=OFF']
options: ['-DBUILD_D=OFF -DBUILD_WITH_BUFR=ON -DBUILD_WITH_EXTRA_DEPS=ON', '-DBUILD_4=OFF -DBUILD_WITH_BUFR=ON -DBUILD_WITH_EXTRA_DEPS=ON', '-DBUILD_SHARED_LIBS=ON']

steps:

Expand All @@ -44,7 +44,7 @@ jobs:
set -x
cd bacio
mkdir build && cd build
if [ "${{ matrix.options }}" = "-DBUILD_SHARED_LIBS=ON -DBUILD_WITH_BUFR=OFF -DBUILD_WITH_EXTRA_DEPS=OFF" ]
if [ "${{ matrix.options }}" = "-DBUILD_SHARED_LIBS=ON" ]
then
cmake -DCMAKE_INSTALL_PREFIX=~/bacio -DBUILD_SHARED_LIBS=ON ..
else
Expand All @@ -58,22 +58,22 @@ jobs:
with:
repository: NOAA-EMC/NCEPLIBS-bufr
path: bufr
ref: bufr_v11.7.1
ref: bufr_v12.0.0

- name: cache-bufr
id: cache-bufr
uses: actions/cache@v2
with:
path: ~/bufr
key: bufr-Linux_options_${{ runner.os }}-v11.7.1-${{ matrix.options }}
key: bufr-Linux_options_${{ runner.os }}-v12.0.0-${{ matrix.options }}

- name: build-bufr
if: steps.cache-bufr.outputs.cache-hit != 'true'
run: |
set -x
cd bufr
mkdir build && cd build
if [ "${{ matrix.options }}" = "-DBUILD_SHARED_LIBS=ON -DBUILD_WITH_BUFR=OFF -DBUILD_WITH_EXTRA_DEPS=OFF" ]
if [ "${{ matrix.options }}" = "-DBUILD_SHARED_LIBS=ON" ]
then
cmake -DCMAKE_INSTALL_PREFIX=~/bufr -DBUILD_TESTING=OFF -DBUILD_SHARED_LIBS=ON ..
else
Expand Down
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ option(BUILD_4 "Build the 4-byte real version of the library, libw3emc_4.a" ON)
option(BUILD_D "Build the 8-byte real version of the library, libw3emc_d.a" ON)
option(BUILD_8 "Build the 8-byte integer version of the library, libsp_8.a" OFF)
option(BUILD_TESTING "Build tests of the library" ON)
option(BUILD_WITH_EXTRA_DEPS "Build w3emc with subprograms which call unknown dependencies" ON)
option(BUILD_WITH_BUFR "Build w3emc with subprograms which call NCEPLIBS-bufr" ON)
option(BUILD_WITH_EXTRA_DEPS "Build w3emc with subprograms which call unknown dependencies" OFF)
option(BUILD_WITH_BUFR "Build w3emc with subprograms which call NCEPLIBS-bufr" OFF)

# If building shared, extra dependencies must be eliminated.
if(BUILD_SHARED_LIBS)
Expand Down

0 comments on commit 624f1e6

Please sign in to comment.