Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
L
libcdi
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mpim-sw
libcdi
Commits
aadde2aa
Commit
aadde2aa
authored
1 month ago
by
Mathieu Westphal
Browse files
Options
Downloads
Patches
Plain Diff
CMake: Fix HAVE_LIBGRIB_API and HAVE_LIBGRIB compile definition
parent
b9a7b1f0
No related branches found
Branches containing commit
No related tags found
Tags containing commit
2 merge requests
!143
CMake: Fix HAVE_LIBGRIB_API and HAVE_LIBGRIB compile definition
,
!138
CMake: Fix HAVE_LIBGRIB_API and HAVE_LIBGRIB compile definition
Pipeline
#99449
passed
3 weeks ago
Stage: basic
Stage: levante
Changes
1
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
CMakeLists.txt
+3
-5
3 additions, 5 deletions
CMakeLists.txt
with
3 additions
and
5 deletions
CMakeLists.txt
+
3
−
5
View file @
aadde2aa
...
...
@@ -22,7 +22,9 @@ endif()
# enable default internal libs
option
(
CDI_LIBGRIB
"GRIB support [default=ON]"
ON
)
if
(
${
CDI_LIBGRIB
}
)
list
(
APPEND cdi_compile_defs HAVE_LIBGRIB=1
)
list
(
APPEND cdi_compile_defs
HAVE_LIBGRIB=1
HAVE_LIBGRIB_API=1
)
endif
()
option
(
CDI_LIBGRIBEX
"Use the CGRIBEX library [default=ON]"
ON
)
...
...
@@ -50,8 +52,6 @@ option(CDI_ECCODES "Use the eccodes library [default=ON]" ON)
if
(
${
CDI_ECCODES
}
OR eccodes_ROOT
)
find_package
(
eccodes
)
if
(
${
eccodes_FOUND
}
)
list
(
APPEND cdi_compile_defs HAVE_LIBGRIB_API=
${
eccodes_FOUND
}
)
message
(
VERBOSE
"added compile definition HAVE_LIBGRIB_API=
${
eccodes_FOUND
}
"
)
list
(
APPEND cdi_linked_libs eccodes
)
else
()
message
(
WARNING
"eccodes not found, compiling without eccodes"
)
...
...
@@ -67,8 +67,6 @@ if(${CDI_NETCDF} OR netCDF_ROOT )
HAVE_LIBNETCDF=
${
netCDF_FOUND
}
HAVE_LIBNC_DAP=
${
netCDF_FOUND
}
HAVE_NETCDF4=
${
netCDF_FOUND
}
HAVE_LIBGRIB_API=
${
netCDF_FOUND
}
HAVE_LIBGRIB=
${
netCDF_FOUND
}
)
list
(
APPEND cdi_linked_libs netCDF::netcdf
)
else
()
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment