From 8e5f7e0889d86c440e5cc8f57631a258298b1d0a Mon Sep 17 00:00:00 2001 From: Henry Weller <http://cfd.direct> Date: Tue, 1 Dec 2015 13:10:51 +0000 Subject: [PATCH] fvOptions: wmakeLnInclude before building the TurbulenceModels libraries Do not link the fvOptions library into the TurbulenceModels libraries due to cyclic dependency --- src/Allwmake | 2 ++ src/TurbulenceModels/compressible/Make/options | 3 +-- src/TurbulenceModels/incompressible/Make/options | 3 +-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Allwmake b/src/Allwmake index c0ea041c37a..2a3d9b7b6f4 100755 --- a/src/Allwmake +++ b/src/Allwmake @@ -41,6 +41,8 @@ wmake $targetType edgeMesh parallel/decompose/AllwmakeLnInclude dummyThirdParty/Allwmake $targetType $* +wmakeLnInclude fvOptions + wmake $targetType finiteVolume wmake $targetType lagrangian/basic wmake $targetType lagrangian/distributionModels diff --git a/src/TurbulenceModels/compressible/Make/options b/src/TurbulenceModels/compressible/Make/options index d0c99293d11..4b17e1ec6fd 100644 --- a/src/TurbulenceModels/compressible/Make/options +++ b/src/TurbulenceModels/compressible/Make/options @@ -17,5 +17,4 @@ LIB_LIBS = \ -lturbulenceModels \ -lspecie \ -lfiniteVolume \ - -lmeshTools \ - -lfvOptions + -lmeshTools diff --git a/src/TurbulenceModels/incompressible/Make/options b/src/TurbulenceModels/incompressible/Make/options index 3d11423ccd5..f5a5d9d8185 100644 --- a/src/TurbulenceModels/incompressible/Make/options +++ b/src/TurbulenceModels/incompressible/Make/options @@ -9,5 +9,4 @@ LIB_LIBS = \ -lincompressibleTransportModels \ -lturbulenceModels \ -lfiniteVolume \ - -lmeshTools \ - -lfvOptions + -lmeshTools -- GitLab