Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

adding cmake support and tests for openjpeg #220

Merged
merged 15 commits into from
Jul 30, 2024
Merged

adding cmake support and tests for openjpeg #220

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
7e10ea5
cmake support for openjpeg
AlysonStahl-NOAA Jul 26, 2024
564dcf3
some typos
AlysonStahl-NOAA Jul 26, 2024
89b3233
set path to jasper
AlysonStahl-NOAA Jul 26, 2024
c8db8cd
typo
AlysonStahl-NOAA Jul 26, 2024
3fee379
Update developer.yml
AlysonStahl-NOAA Jul 26, 2024
a810b87
debugging
AlysonStahl-NOAA Jul 26, 2024
9746a02
more debugging
AlysonStahl-NOAA Jul 26, 2024
5642344
Delete settings.json
AlysonStahl-NOAA Jul 26, 2024
e5c7b03
more debugging
AlysonStahl-NOAA Jul 26, 2024
94b4efa
debug
AlysonStahl-NOAA Jul 26, 2024
810c791
debugging
AlysonStahl-NOAA Jul 26, 2024
70ab51e
Update CMakeLists.txt
AlysonStahl-NOAA Jul 26, 2024
828fb9d
Merge branch 'develop' into as_openjpeg
AlysonStahl-NOAA Jul 26, 2024
2f5bc1c
adding test
AlysonStahl-NOAA Jul 30, 2024
bf6d59f
swapped out test
AlysonStahl-NOAA Jul 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/developer.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
if: steps.cache-jasper.outputs.cache-hit != 'true'
run: |
cd jasper
./configure --prefix=$HOME/jasper
./configure --prefix=$HOME/Jasper
make
make install

Expand Down Expand Up @@ -141,7 +141,7 @@ jobs:
export CFLAGS='-Wall -g -fprofile-abs-path -fprofile-arcs -ftest-coverage -O0'
export FCFLAGS='-Wall -g -fprofile-abs-path -fprofile-arcs -ftest-coverage -O0'
export FFLAGS='-Wall -g -fprofile-abs-path -fprofile-arcs -ftest-coverage -O0'
cmake .. -DENABLE_DOCS=ON -DFTP_TEST_FILES=ON -DCMAKE_PREFIX_PATH="~/ip;~/ip2;~/sp;~/jasper" -DTEST_FILE_DIR=/home/runner/data -DUSE_NETCDF4=ON -DUSE_AEC=ON -DUSE_IPOLATES=ON -DUSE_JASPER=ON
cmake .. -DENABLE_DOCS=ON -DFTP_TEST_FILES=ON -DCMAKE_PREFIX_PATH="~/ip;~/ip2;~/sp;~/Jasper" -DTEST_FILE_DIR=/home/runner/data -DUSE_NETCDF4=ON -DUSE_AEC=ON -DUSE_IPOLATES=ON -DUSE_JASPER=ON
make VERBOSE=1
ctest --verbose --output-on-failure --rerun-failed
gcovr --root .. -v --html-details --exclude ../tests --exclude CMakeFiles --print-summary -o test-coverage.html &> /dev/null
Expand Down
5 changes: 5 additions & 0 deletions .vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"files.associations": {
"grb2.h": "c"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this file intentional?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nope, I'll remove it. Thanks for pointing it out.

}
}
3 changes: 0 additions & 3 deletions wgrib2/Config.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
#include <ctype.h>
#include <limits.h>
#include "wgrib2.h"
#ifdef USE_JASPER
#include <jasper/jasper.h>
#endif
#include "grb2.h"
#include "fnlist.h"

Expand Down
Loading