zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

COMP: use -iquotedir for including the local '.' directory

Browse Source 
- 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
This commit is contained in:
Mark Olesen
2020-05-06 10:15:32 +02:00
parent b4bf26ea4f
commit 595579e01d
30 changed files with 10 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
applications/solvers/combustion/coldEngineFoam/Make/options
View File

@ -1,5 +1,4 @@
EXE_INC = \ EXE_INC = \
-I. \
-I../XiFoam/XiEngineFoam \ -I../XiFoam/XiEngineFoam \
-I../XiFoam \ -I../XiFoam \
-I../../compressible/rhoPimpleFoam \ -I../../compressible/rhoPimpleFoam \

1
applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/Make/options
View File

@ -1,5 +1,4 @@
EXE_INC = \ EXE_INC = \
-I. \
-I$(FOAM_SOLVERS)/combustion/reactingFoam \ -I$(FOAM_SOLVERS)/combustion/reactingFoam \
-I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \

1
applications/solvers/combustion/reactingFoam/rhoReactingFoam/Make/options
View File

@ -1,5 +1,4 @@
EXE_INC = \ EXE_INC = \
-I. \
-I$(FOAM_SOLVERS)/combustion/reactingFoam \ -I$(FOAM_SOLVERS)/combustion/reactingFoam \
-I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \

1
applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/Make/options
View File

@ -1,5 +1,4 @@
EXE_INC = \ EXE_INC = \
-I. \
-I.. \ -I.. \
-I$(LIB_SRC)/finiteVolume/cfdTools \ -I$(LIB_SRC)/finiteVolume/cfdTools \
-I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \

1
applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/Make/options
View File

@ -1,5 +1,4 @@
EXE_INC = \ EXE_INC = \
-I. \
-I../buoyantBoussinesqSimpleFoam \ -I../buoyantBoussinesqSimpleFoam \
-I$(LIB_SRC)/sampling/lnInclude \ -I$(LIB_SRC)/sampling/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \

1
applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options
View File

@ -1,5 +1,4 @@
EXE_INC = \ EXE_INC = \
-I. \
-I./fluid \ -I./fluid \
-I./solid \ -I./solid \
-I./porousFluid \ -I./porousFluid \

5
applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/Make/options
View File

@ -1,8 +1,7 @@
EXE_INC = \ EXE_INC = \
-I. \
-I.. \ -I.. \
-Ifluid \ -I./fluid \
-Isolid \ -I./solid \
-I../solid \ -I../solid \
-I$(LIB_SRC)/finiteVolume/cfdTools \ -I$(LIB_SRC)/finiteVolume/cfdTools \
-I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \

5
applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/Make/options
View File

@ -1,5 +1,4 @@
EXE_INC = \ EXE_INC = \
-I. \
-I.. \ -I.. \
-I$(FOAM_SOLVERS)/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam \ -I$(FOAM_SOLVERS)/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam \
-I$(LIB_SRC)/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/lnInclude \ -I$(LIB_SRC)/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/lnInclude \
@ -37,5 +36,5 @@ EXE_LIBS = \
-lradiationModels \ -lradiationModels \
-lregionModels \ -lregionModels \
-lsampling \ -lsampling \
-lreactingTwoPhaseSystem \ -lreactingPhaseSystem \
-lreactingTwoPhaseSystem

1
applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/Make/options
View File

@ -1,5 +1,4 @@
EXE_INC = \ EXE_INC = \
-I. \
-I.. \ -I.. \
-I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \

1
applications/solvers/incompressible/simpleFoam/overSimpleFoam/Make/options
View File

@ -1,5 +1,4 @@
EXE_INC = \ EXE_INC = \
-I. \
-I$(FOAM_SOLVERS)/incompressible/pimpleFoam/overPimpleDyMFoam \ -I$(FOAM_SOLVERS)/incompressible/pimpleFoam/overPimpleDyMFoam \
-I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \

1
applications/solvers/lagrangian/reactingParcelFoam/Make/options
View File

@ -1,5 +1,4 @@
EXE_INC = \ EXE_INC = \
-I. \
-I../reactingParcelFoam \ -I../reactingParcelFoam \
-I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \
-I${LIB_SRC}/meshTools/lnInclude \ -I${LIB_SRC}/meshTools/lnInclude \

1
applications/solvers/lagrangian/reactingParcelFoam/reactingHeterogenousParcelFoam/Make/options
View File

@ -1,5 +1,4 @@
EXE_INC = \ EXE_INC = \
-I. \
-I.. \ -I.. \
-I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \
-I${LIB_SRC}/sampling/lnInclude \ -I${LIB_SRC}/sampling/lnInclude \

1
applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/Make/options
View File

@ -1,5 +1,4 @@
EXE_INC = \ EXE_INC = \
-I. \
-I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \
-I${LIB_SRC}/meshTools/lnInclude \ -I${LIB_SRC}/meshTools/lnInclude \
-I$(LIB_SRC)/sampling/lnInclude \ -I$(LIB_SRC)/sampling/lnInclude \

1
applications/solvers/lagrangian/sprayFoam/Make/options
View File

@ -1,5 +1,4 @@
EXE_INC = \ EXE_INC = \
-I. \
-I../reactingParcelFoam \ -I../reactingParcelFoam \
-I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \
-I${LIB_SRC}/meshTools/lnInclude \ -I${LIB_SRC}/meshTools/lnInclude \

1
applications/solvers/lagrangian/sprayFoam/engineFoam/Make/options
View File

@ -1,5 +1,4 @@
EXE_INC = \ EXE_INC = \
-I. \
-I../sprayDyMFoam \ -I../sprayDyMFoam \
-I.. \ -I.. \
-I../../reactingParcelFoam \ -I../../reactingParcelFoam \

3
applications/solvers/multiphase/MPPICInterFoam/Make/options
View File

@ -1,7 +1,6 @@
interFoamPath = $(FOAM_SOLVERS)/multiphase/interFoam interFoamPath = $(FOAM_SOLVERS)/multiphase/interFoam
EXE_INC = \ EXE_INC = \
-I. \
-I../VoF \ -I../VoF \
-I./IncompressibleTwoPhaseMixtureTurbulenceModels/lnInclude \ -I./IncompressibleTwoPhaseMixtureTurbulenceModels/lnInclude \
-I$(interFoamPath) \ -I$(interFoamPath) \

1
applications/solvers/multiphase/compressibleInterFoam/Make/options
View File

@ -1,5 +1,4 @@
EXE_INC = \ EXE_INC = \
-I. \
-I../VoF \ -I../VoF \
-ItwoPhaseMixtureThermo \ -ItwoPhaseMixtureThermo \
-I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \

1
applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/Make/options
View File

@ -1,5 +1,4 @@
EXE_INC = \ EXE_INC = \
-I. \
-I.. \ -I.. \
-I../../VoF \ -I../../VoF \
-I../twoPhaseMixtureThermo \ -I../twoPhaseMixtureThermo \

1
applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/Make/options
View File

@ -1,5 +1,4 @@
EXE_INC = \ EXE_INC = \
-I. \
-I.. \ -I.. \
-I../../VoF \ -I../../VoF \
-I../twoPhaseMixtureThermo \ -I../twoPhaseMixtureThermo \

1
applications/solvers/multiphase/compressibleMultiphaseInterFoam/Make/options
View File

@ -1,5 +1,4 @@
EXE_INC = \ EXE_INC = \
-I. \
-I../VoF \ -I../VoF \
-I../interFoam \ -I../interFoam \
-ImultiphaseMixtureThermo/lnInclude \ -ImultiphaseMixtureThermo/lnInclude \

1
applications/solvers/multiphase/interCondensatingEvaporatingFoam/Make/options
View File

@ -3,7 +3,6 @@ interFoam = $(FOAM_SOLVERS)/multiphase/interFoam
VoF = $(FOAM_SOLVERS)/multiphase/VoF VoF = $(FOAM_SOLVERS)/multiphase/VoF
EXE_INC = \ EXE_INC = \
-I. \
-I$(interPhaseChangeFoam) \ -I$(interPhaseChangeFoam) \
-I$(interFoam) \ -I$(interFoam) \
-I$(VoF) \ -I$(VoF) \

1
applications/solvers/multiphase/interFoam/interMixingFoam/Make/options
View File

@ -1,5 +1,4 @@
EXE_INC = \ EXE_INC = \
-I. \
-I.. \ -I.. \
-I../../VoF \ -I../../VoF \
-I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \ -I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \

1
applications/solvers/multiphase/interFoam/overInterDyMFoam/Make/options
View File

@ -1,5 +1,4 @@
EXE_INC = \ EXE_INC = \
-I. \
-I.. \ -I.. \
-I../../VoF \ -I../../VoF \
-I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \

1
applications/solvers/multiphase/multiphaseInterFoam/Make/options
View File

@ -1,5 +1,4 @@
EXE_INC = \ EXE_INC = \
-I. \
-I../VoF \ -I../VoF \
-I../interFoam \ -I../interFoam \
-ImultiphaseMixture/lnInclude \ -ImultiphaseMixture/lnInclude \

1
applications/solvers/multiphase/twoLiquidMixingFoam/Make/options
View File

@ -1,5 +1,4 @@
EXE_INC = \ EXE_INC = \
-I. \
-I../VoF \ -I../VoF \
-I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \

1
applications/solvers/stressAnalysis/solidDisplacementFoam/Make/options
View File

@ -1,5 +1,4 @@
EXE_INC = \ EXE_INC = \
-I. \
-ItractionDisplacement/lnInclude \ -ItractionDisplacement/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude -I$(LIB_SRC)/meshTools/lnInclude

1
applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/Make/options
View File

@ -1,5 +1,4 @@
EXE_INC = \ EXE_INC = \
-I. \
-I../solidDisplacementFoam \ -I../solidDisplacementFoam \
-ItractionDisplacementCorrectionStress \ -ItractionDisplacementCorrectionStress \
-I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \

2
applications/utilities/mesh/generation/foamyMesh/cellSizeAndAlignmentGrid/Make/options
View File

@ -6,7 +6,7 @@ CGAL_INEXACT = -DCGAL_INEXACT
include $(GENERAL_RULES)/CGAL include $(GENERAL_RULES)/CGAL
EXE_INC = \ EXE_INC = \
${ROUNDING_MATH} \ ${ROUNDING_MATH} \
${EXE_NDEBUG} \ ${EXE_NDEBUG} \
${CGAL_INEXACT} \ ${CGAL_INEXACT} \

2
applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/Make/options
View File

@ -26,6 +26,8 @@ EXE_LIBS = \
-lextrudeModel \ -lextrudeModel \
-lcv2DMesh \ -lcv2DMesh \
-lconformalVoronoiMesh \ -lconformalVoronoiMesh \
-lfileFormats \
-lsurfMesh \
-lmeshTools \ -lmeshTools \
-ldynamicMesh \ -ldynamicMesh \
-ldecompositionMethods \ -ldecompositionMethods \

4
wmake/makefiles/general
View File

@ -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 = \ LIB_HEADER_DIRS = \
$(EXE_INC) \ $(EXE_INC) \
-iquote. \
-IlnInclude \ -IlnInclude \
-I. \
$(PROJECT_INC) \ $(PROJECT_INC) \
$(GINC) \ $(GINC) \
$(SYS_INC) $(SYS_INC)