From 595579e01d5ff31d0429a907edb33ee04e8ffcbf Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Wed, 6 May 2020 10:15:32 +0200 Subject: [PATCH] COMP: use -iquotedir for including the local '.' directory - adds into the include-quoted search list instead the general (-Idir) search list. * makes it less subject to ordering (since it will now generally be searched first) and makes it less subject to how duplicate removal is implemented. In some compilers (#1627), the last instance of a duplicate directory would be used and not the first instance. * removes clutter in some Make/options files COMP: add missing linkage libraries --- applications/solvers/combustion/coldEngineFoam/Make/options | 1 - .../reactingFoam/rhoReactingBuoyantFoam/Make/options | 1 - .../combustion/reactingFoam/rhoReactingFoam/Make/options | 1 - .../rhoSimpleFoam/rhoPorousSimpleFoam/Make/options | 1 - .../heatTransfer/buoyantBoussinesqPimpleFoam/Make/options | 1 - .../solvers/heatTransfer/chtMultiRegionFoam/Make/options | 1 - .../chtMultiRegionFoam/chtMultiRegionSimpleFoam/Make/options | 5 ++--- .../chtMultiRegionTwoPhaseEulerFoam/Make/options | 5 ++--- .../incompressible/pimpleFoam/SRFPimpleFoam/Make/options | 1 - .../incompressible/simpleFoam/overSimpleFoam/Make/options | 1 - .../solvers/lagrangian/reactingParcelFoam/Make/options | 1 - .../reactingHeterogenousParcelFoam/Make/options | 1 - .../reactingParcelFoam/simpleReactingParcelFoam/Make/options | 1 - applications/solvers/lagrangian/sprayFoam/Make/options | 1 - .../solvers/lagrangian/sprayFoam/engineFoam/Make/options | 1 - applications/solvers/multiphase/MPPICInterFoam/Make/options | 3 +-- .../solvers/multiphase/compressibleInterFoam/Make/options | 1 - .../compressibleInterDyMFoam/Make/options | 1 - .../compressibleInterFilmFoam/Make/options | 1 - .../multiphase/compressibleMultiphaseInterFoam/Make/options | 1 - .../multiphase/interCondensatingEvaporatingFoam/Make/options | 1 - .../multiphase/interFoam/interMixingFoam/Make/options | 1 - .../multiphase/interFoam/overInterDyMFoam/Make/options | 1 - .../solvers/multiphase/multiphaseInterFoam/Make/options | 1 - .../solvers/multiphase/twoLiquidMixingFoam/Make/options | 1 - .../stressAnalysis/solidDisplacementFoam/Make/options | 1 - .../solidEquilibriumDisplacementFoam/Make/options | 1 - .../foamyMesh/cellSizeAndAlignmentGrid/Make/options | 2 +- .../mesh/generation/foamyMesh/foamyQuadMesh/Make/options | 2 ++ wmake/makefiles/general | 4 ++-- 30 files changed, 10 insertions(+), 35 deletions(-) diff --git a/applications/solvers/combustion/coldEngineFoam/Make/options b/applications/solvers/combustion/coldEngineFoam/Make/options index 85522284aa..9493f78508 100644 --- a/applications/solvers/combustion/coldEngineFoam/Make/options +++ b/applications/solvers/combustion/coldEngineFoam/Make/options @@ -1,5 +1,4 @@ EXE_INC = \ - -I. \ -I../XiFoam/XiEngineFoam \ -I../XiFoam \ -I../../compressible/rhoPimpleFoam \ diff --git a/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/Make/options b/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/Make/options index b9a9e3284f..ad06afa0c0 100644 --- a/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/Make/options +++ b/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/Make/options @@ -1,5 +1,4 @@ EXE_INC = \ - -I. \ -I$(FOAM_SOLVERS)/combustion/reactingFoam \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ diff --git a/applications/solvers/combustion/reactingFoam/rhoReactingFoam/Make/options b/applications/solvers/combustion/reactingFoam/rhoReactingFoam/Make/options index b9a9e3284f..ad06afa0c0 100644 --- a/applications/solvers/combustion/reactingFoam/rhoReactingFoam/Make/options +++ b/applications/solvers/combustion/reactingFoam/rhoReactingFoam/Make/options @@ -1,5 +1,4 @@ EXE_INC = \ - -I. \ -I$(FOAM_SOLVERS)/combustion/reactingFoam \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/Make/options b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/Make/options index f63742a0b2..9e9ee05ce4 100644 --- a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/Make/options +++ b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/Make/options @@ -1,5 +1,4 @@ EXE_INC = \ - -I. \ -I.. \ -I$(LIB_SRC)/finiteVolume/cfdTools \ -I$(LIB_SRC)/finiteVolume/lnInclude \ diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/Make/options b/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/Make/options index 88f5b10fa1..59302f6e45 100644 --- a/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/Make/options +++ b/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/Make/options @@ -1,5 +1,4 @@ EXE_INC = \ - -I. \ -I../buoyantBoussinesqSimpleFoam \ -I$(LIB_SRC)/sampling/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options b/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options index 39a0f84850..4a527e03e6 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options @@ -1,5 +1,4 @@ EXE_INC = \ - -I. \ -I./fluid \ -I./solid \ -I./porousFluid \ diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/Make/options b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/Make/options index b79bb86475..14bbcc2cee 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/Make/options +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/Make/options @@ -1,8 +1,7 @@ EXE_INC = \ - -I. \ -I.. \ - -Ifluid \ - -Isolid \ + -I./fluid \ + -I./solid \ -I../solid \ -I$(LIB_SRC)/finiteVolume/cfdTools \ -I$(LIB_SRC)/finiteVolume/lnInclude \ diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/Make/options b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/Make/options index 4a667217bd..ced67af4db 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/Make/options +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/Make/options @@ -1,5 +1,4 @@ EXE_INC = \ - -I. \ -I.. \ -I$(FOAM_SOLVERS)/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam \ -I$(LIB_SRC)/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/lnInclude \ @@ -37,5 +36,5 @@ EXE_LIBS = \ -lradiationModels \ -lregionModels \ -lsampling \ - -lreactingTwoPhaseSystem \ - + -lreactingPhaseSystem \ + -lreactingTwoPhaseSystem diff --git a/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/Make/options b/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/Make/options index 4d54ba8bb0..37cb3a60f8 100644 --- a/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/Make/options +++ b/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/Make/options @@ -1,5 +1,4 @@ EXE_INC = \ - -I. \ -I.. \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ diff --git a/applications/solvers/incompressible/simpleFoam/overSimpleFoam/Make/options b/applications/solvers/incompressible/simpleFoam/overSimpleFoam/Make/options index 99ae8b275c..1562594fc0 100644 --- a/applications/solvers/incompressible/simpleFoam/overSimpleFoam/Make/options +++ b/applications/solvers/incompressible/simpleFoam/overSimpleFoam/Make/options @@ -1,5 +1,4 @@ EXE_INC = \ - -I. \ -I$(FOAM_SOLVERS)/incompressible/pimpleFoam/overPimpleDyMFoam \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ diff --git a/applications/solvers/lagrangian/reactingParcelFoam/Make/options b/applications/solvers/lagrangian/reactingParcelFoam/Make/options index 400a8318ca..5a6dbd5a1d 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/Make/options +++ b/applications/solvers/lagrangian/reactingParcelFoam/Make/options @@ -1,5 +1,4 @@ EXE_INC = \ - -I. \ -I../reactingParcelFoam \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I${LIB_SRC}/meshTools/lnInclude \ diff --git a/applications/solvers/lagrangian/reactingParcelFoam/reactingHeterogenousParcelFoam/Make/options b/applications/solvers/lagrangian/reactingParcelFoam/reactingHeterogenousParcelFoam/Make/options index 841ef8c9c7..1bbc23c227 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/reactingHeterogenousParcelFoam/Make/options +++ b/applications/solvers/lagrangian/reactingParcelFoam/reactingHeterogenousParcelFoam/Make/options @@ -1,5 +1,4 @@ EXE_INC = \ - -I. \ -I.. \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I${LIB_SRC}/sampling/lnInclude \ diff --git a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/Make/options b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/Make/options index db2dee99f2..3c6c7ad6a7 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/Make/options +++ b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/Make/options @@ -1,5 +1,4 @@ EXE_INC = \ - -I. \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I${LIB_SRC}/meshTools/lnInclude \ -I$(LIB_SRC)/sampling/lnInclude \ diff --git a/applications/solvers/lagrangian/sprayFoam/Make/options b/applications/solvers/lagrangian/sprayFoam/Make/options index a5e46f6f20..9d9d39515e 100644 --- a/applications/solvers/lagrangian/sprayFoam/Make/options +++ b/applications/solvers/lagrangian/sprayFoam/Make/options @@ -1,5 +1,4 @@ EXE_INC = \ - -I. \ -I../reactingParcelFoam \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I${LIB_SRC}/meshTools/lnInclude \ diff --git a/applications/solvers/lagrangian/sprayFoam/engineFoam/Make/options b/applications/solvers/lagrangian/sprayFoam/engineFoam/Make/options index 066274b18d..f32172e111 100644 --- a/applications/solvers/lagrangian/sprayFoam/engineFoam/Make/options +++ b/applications/solvers/lagrangian/sprayFoam/engineFoam/Make/options @@ -1,5 +1,4 @@ EXE_INC = \ - -I. \ -I../sprayDyMFoam \ -I.. \ -I../../reactingParcelFoam \ diff --git a/applications/solvers/multiphase/MPPICInterFoam/Make/options b/applications/solvers/multiphase/MPPICInterFoam/Make/options index 4e877295c3..0ecf85c239 100644 --- a/applications/solvers/multiphase/MPPICInterFoam/Make/options +++ b/applications/solvers/multiphase/MPPICInterFoam/Make/options @@ -1,7 +1,6 @@ interFoamPath = $(FOAM_SOLVERS)/multiphase/interFoam -EXE_INC = \ - -I. \ +EXE_INC = \ -I../VoF \ -I./IncompressibleTwoPhaseMixtureTurbulenceModels/lnInclude \ -I$(interFoamPath) \ diff --git a/applications/solvers/multiphase/compressibleInterFoam/Make/options b/applications/solvers/multiphase/compressibleInterFoam/Make/options index 3d55f7f675..5fce651136 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/Make/options +++ b/applications/solvers/multiphase/compressibleInterFoam/Make/options @@ -1,5 +1,4 @@ EXE_INC = \ - -I. \ -I../VoF \ -ItwoPhaseMixtureThermo \ -I$(LIB_SRC)/finiteVolume/lnInclude \ diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/Make/options b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/Make/options index 12483a736d..cc49e190f4 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/Make/options +++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/Make/options @@ -1,5 +1,4 @@ EXE_INC = \ - -I. \ -I.. \ -I../../VoF \ -I../twoPhaseMixtureThermo \ diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/Make/options b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/Make/options index e96dde6590..147de78460 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/Make/options +++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/Make/options @@ -1,5 +1,4 @@ EXE_INC = \ - -I. \ -I.. \ -I../../VoF \ -I../twoPhaseMixtureThermo \ diff --git a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/Make/options b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/Make/options index 5c32e325ca..b58b0af6b0 100644 --- a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/Make/options +++ b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/Make/options @@ -1,5 +1,4 @@ EXE_INC = \ - -I. \ -I../VoF \ -I../interFoam \ -ImultiphaseMixtureThermo/lnInclude \ diff --git a/applications/solvers/multiphase/interCondensatingEvaporatingFoam/Make/options b/applications/solvers/multiphase/interCondensatingEvaporatingFoam/Make/options index 0a9bec959f..c1a909b423 100644 --- a/applications/solvers/multiphase/interCondensatingEvaporatingFoam/Make/options +++ b/applications/solvers/multiphase/interCondensatingEvaporatingFoam/Make/options @@ -3,7 +3,6 @@ interFoam = $(FOAM_SOLVERS)/multiphase/interFoam VoF = $(FOAM_SOLVERS)/multiphase/VoF EXE_INC = \ - -I. \ -I$(interPhaseChangeFoam) \ -I$(interFoam) \ -I$(VoF) \ diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/Make/options b/applications/solvers/multiphase/interFoam/interMixingFoam/Make/options index 76551a9d1c..ab62352eb5 100644 --- a/applications/solvers/multiphase/interFoam/interMixingFoam/Make/options +++ b/applications/solvers/multiphase/interFoam/interMixingFoam/Make/options @@ -1,5 +1,4 @@ EXE_INC = \ - -I. \ -I.. \ -I../../VoF \ -I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \ diff --git a/applications/solvers/multiphase/interFoam/overInterDyMFoam/Make/options b/applications/solvers/multiphase/interFoam/overInterDyMFoam/Make/options index bfc9da810d..b5364f3e44 100644 --- a/applications/solvers/multiphase/interFoam/overInterDyMFoam/Make/options +++ b/applications/solvers/multiphase/interFoam/overInterDyMFoam/Make/options @@ -1,5 +1,4 @@ EXE_INC = \ - -I. \ -I.. \ -I../../VoF \ -I$(LIB_SRC)/finiteVolume/lnInclude \ diff --git a/applications/solvers/multiphase/multiphaseInterFoam/Make/options b/applications/solvers/multiphase/multiphaseInterFoam/Make/options index 2f1c209dc6..5daf058359 100644 --- a/applications/solvers/multiphase/multiphaseInterFoam/Make/options +++ b/applications/solvers/multiphase/multiphaseInterFoam/Make/options @@ -1,5 +1,4 @@ EXE_INC = \ - -I. \ -I../VoF \ -I../interFoam \ -ImultiphaseMixture/lnInclude \ diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/Make/options b/applications/solvers/multiphase/twoLiquidMixingFoam/Make/options index ded7a8f39a..655c32a572 100644 --- a/applications/solvers/multiphase/twoLiquidMixingFoam/Make/options +++ b/applications/solvers/multiphase/twoLiquidMixingFoam/Make/options @@ -1,5 +1,4 @@ EXE_INC = \ - -I. \ -I../VoF \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ diff --git a/applications/solvers/stressAnalysis/solidDisplacementFoam/Make/options b/applications/solvers/stressAnalysis/solidDisplacementFoam/Make/options index 28d26a7fd1..cb550fefd6 100644 --- a/applications/solvers/stressAnalysis/solidDisplacementFoam/Make/options +++ b/applications/solvers/stressAnalysis/solidDisplacementFoam/Make/options @@ -1,5 +1,4 @@ EXE_INC = \ - -I. \ -ItractionDisplacement/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude diff --git a/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/Make/options b/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/Make/options index 5201a0cd11..2393d0bd6f 100644 --- a/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/Make/options +++ b/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/Make/options @@ -1,5 +1,4 @@ EXE_INC = \ - -I. \ -I../solidDisplacementFoam \ -ItractionDisplacementCorrectionStress \ -I$(LIB_SRC)/finiteVolume/lnInclude \ diff --git a/applications/utilities/mesh/generation/foamyMesh/cellSizeAndAlignmentGrid/Make/options b/applications/utilities/mesh/generation/foamyMesh/cellSizeAndAlignmentGrid/Make/options index cf60a29d5e..8059fdffa7 100644 --- a/applications/utilities/mesh/generation/foamyMesh/cellSizeAndAlignmentGrid/Make/options +++ b/applications/utilities/mesh/generation/foamyMesh/cellSizeAndAlignmentGrid/Make/options @@ -6,7 +6,7 @@ CGAL_INEXACT = -DCGAL_INEXACT include $(GENERAL_RULES)/CGAL -EXE_INC = \ +EXE_INC = \ ${ROUNDING_MATH} \ ${EXE_NDEBUG} \ ${CGAL_INEXACT} \ diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/Make/options b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/Make/options index 86692371c1..7905272444 100644 --- a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/Make/options +++ b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/Make/options @@ -26,6 +26,8 @@ EXE_LIBS = \ -lextrudeModel \ -lcv2DMesh \ -lconformalVoronoiMesh \ + -lfileFormats \ + -lsurfMesh \ -lmeshTools \ -ldynamicMesh \ -ldecompositionMethods \ diff --git a/wmake/makefiles/general b/wmake/makefiles/general index 805f94114f..14c434d8f7 100644 --- a/wmake/makefiles/general +++ b/wmake/makefiles/general @@ -120,13 +120,13 @@ OBJECTS=$(BASENAMES:%=$(OBJECTS_DIR)/%.o) #------------------------------------------------------------------------------ -# Set header file include paths +# Include paths, use -iquote to ensure that (.) is searched first #------------------------------------------------------------------------------ LIB_HEADER_DIRS = \ $(EXE_INC) \ + -iquote. \ -IlnInclude \ - -I. \ $(PROJECT_INC) \ $(GINC) \ $(SYS_INC)