diff --git a/ThirdParty/container-maker b/ThirdParty/container-maker index 4f14f402122cfbb3f8ce7c1b47ce79510c40962f..d4a466c0fc28e693c781e653a9234b838d342c80 160000 --- a/ThirdParty/container-maker +++ b/ThirdParty/container-maker @@ -1 +1 @@ -Subproject commit 4f14f402122cfbb3f8ce7c1b47ce79510c40962f +Subproject commit d4a466c0fc28e693c781e653a9234b838d342c80 diff --git a/scripts/ci/jobs/container.yml b/scripts/ci/jobs/container.yml index 798f1a0f2b41a64d3660cc74c48c7b84fcd7f921..d3e4e3039650307d28452ff4183f489b2d88836d 100644 --- a/scripts/ci/jobs/container.yml +++ b/scripts/ci/jobs/container.yml @@ -32,7 +32,7 @@ container: - > poetry run ogscm compiler.py ogs.py -B -C -R --ogs ../.. --build_args ' --progress=plain' - --cvode --ccache --cpmcache --mfront + --cvode --ccache --cpmcache --mfront --netcdf --cpu-target $CPU_TARGET --cmake_args ' -DOGS_BUILD_TESTING=OFF' $DOCKER_TAG_SERIAL @@ -41,7 +41,7 @@ container: - > poetry run ogscm compiler.py mpi.py ogs.py -B -C -R --ogs ../.. --build_args ' --progress=plain' - --cvode --ccache --cpmcache + --cvode --ccache --cpmcache --mfront --netcdf --cpu-target $CPU_TARGET --cmake_args ' -DOGS_BUILD_TESTING=OFF' --ompi 4.0.5 --mpi_benchmarks diff --git a/scripts/cmake/Dependencies.cmake b/scripts/cmake/Dependencies.cmake index 150cee48d2f2d753408784925061352fa745c44d..5bbc49b465e776121cdd00205d85badbfe84e5f9 100644 --- a/scripts/cmake/Dependencies.cmake +++ b/scripts/cmake/Dependencies.cmake @@ -459,7 +459,7 @@ if(OGS_USE_NETCDF) set_target_properties( netCDF::netcdf PROPERTIES INTERFACE_LINK_LIBRARIES "" ) # fix win installed config - target_link_libraries(netcdf-cxx4 PUBLIC netCDF::netcdf) + target_link_libraries(netcdf-cxx4 netCDF::netcdf) else() find_path(NETCDF_INCLUDES_CXX NAMES netcdf) add_library(netcdf-cxx4 INTERFACE IMPORTED)