Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Open sidebar
yezhigangzju
ogs
Commits
f62b1de2
Verified
Commit
f62b1de2
authored
Nov 26, 2020
by
Lars Bilke
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[Conan] Update netcdf package.
parent
ff5a283b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
7 deletions
+1
-7
scripts/cmake/ConanSetup.cmake
scripts/cmake/ConanSetup.cmake
+1
-1
scripts/cmake/Find.cmake
scripts/cmake/Find.cmake
+0
-6
No files found.
scripts/cmake/ConanSetup.cmake
View file @
f62b1de2
...
...
@@ -112,7 +112,7 @@ if(OGS_BUILD_GUI)
endif
()
if
(
OGS_USE_NETCDF
)
set
(
CONAN_REQUIRES
${
CONAN_REQUIRES
}
netcdf-cxx/4.3.1@bilke/testing
)
set
(
CONAN_REQUIRES
${
CONAN_REQUIRES
}
netcdf-cxx/4.3.1
-1
@bilke/testing
)
endif
()
conan_check
(
VERSION
${
ogs.minimum_version.conan
}
)
...
...
scripts/cmake/Find.cmake
View file @
f62b1de2
...
...
@@ -123,12 +123,6 @@ if(OGS_USE_NETCDF)
set
(
NETCDF_ROOT
${
CONAN_NETCDF-C_ROOT
}
)
set
(
NETCDF_CXX_ROOT
${
CONAN_NETCDF-CXX_ROOT
}
)
find_package
(
NetCDF REQUIRED
)
if
(
OGS_USE_CONAN AND MSVC
)
set
(
HDF5_DIR
${
CONAN_HDF5_ROOT
}
/cmake/hdf5
)
find_package
(
HDF5 REQUIRED COMPONENTS C HL NO_MODULE
)
else
()
find_package
(
HDF5 REQUIRED COMPONENTS C HL
)
endif
()
add_compile_options
(
-DOGS_USE_NETCDF
)
endif
()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment