songtianlun/openfoam
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

STYLE: formatting in makefiles, config files

Browse Source 
- fix typo in makefiles/info that affected wmake -show-compile-c

- additional safeguard in src/OpenFOAM/Make/options against self-linking.
  This is not normally required unless PROJECT_LIBS has been added into
  the link stage.
This commit is contained in:
Mark Olesen 2019-04-16 12:39:25 +02:00 committed by Andrew Heather
parent d14f181529
commit 2d7c266d37
6 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
etc/config.csh/mpi
View File

@ -40,7 +40,7 @@ case SYSTEMOPENMPI*:
setenv FOAM_MPI openmpi-system
_foamEtc -config openmpi-system # <- Adjustments (optional)
# Respect MPI_ARCH_PATH if set to a valid directory (ie, from user adjustments)
# Respect MPI_ARCH_PATH if set to valid directory (eg, user adjustments)
if (! $?MPI_ARCH_PATH ) setenv MPI_ARCH_PATH
if ( -d "$MPI_ARCH_PATH" ) then
_foamAddLibAuto $MPI_ARCH_PATH
@ -58,7 +58,7 @@ case OPENMPI:
setenv FOAM_MPI openmpi-1.10.7
_foamEtc -config openmpi # <- Adjustments (optional)
# Respect MPI_ARCH_PATH if set to a valid directory (ie, from user adjustments)
# Respect MPI_ARCH_PATH if set to valid directory (eg, user adjustments)
if (! $?MPI_ARCH_PATH ) setenv MPI_ARCH_PATH
if (! -d "$MPI_ARCH_PATH" ) then
setenv MPI_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$FOAM_MPI

4
etc/config.sh/mpi
View File

@ -46,7 +46,7 @@ SYSTEMOPENMPI*)
fi
_foamEtc -config openmpi-system # <- Adjustments (optional)
# Respect MPI_ARCH_PATH if set to a valid directory (ie, from user adjustments)
# Respect MPI_ARCH_PATH if set to valid directory (eg, user adjustments)
if [ -d "$MPI_ARCH_PATH" ]
then
_foamAddLibAuto $MPI_ARCH_PATH
@ -64,7 +64,7 @@ OPENMPI)
export FOAM_MPI=openmpi-1.10.7
_foamEtc -config openmpi # <- Adjustments (optional)
# Respect MPI_ARCH_PATH if set to a valid directory (ie, from user adjustments)
# Respect MPI_ARCH_PATH if set to valid directory (eg, user adjustments)
if [ ! -d "$MPI_ARCH_PATH" ]
then
export MPI_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$FOAM_MPI

5
src/OpenFOAM/Make/options
View File

@ -1,3 +1,8 @@
/* Preclude any possible issues if WM_PROJECT == OpenFOAM */
ifeq ($(WM_PROJECT),OpenFOAM)
PROJECT_LIBS =
endif
EXE_INC = \
-I$(OBJECTS_DIR)

2
wmake/makefiles/general
View File

@ -38,7 +38,7 @@ endif
#------------------------------------------------------------------------------
# Set the directory containing the wmake scripts
# Directory containing the wmake scripts
#------------------------------------------------------------------------------
WM_SCRIPTS = $(WM_DIR)/scripts

4
wmake/makefiles/info
View File

@ -19,7 +19,7 @@
#------------------------------------------------------------------------------
#------------------------------------------------------------------------------
# Use POSIX shell. Default to POSIX for the OS.
# Use POSIX shell
#------------------------------------------------------------------------------
SHELL = /bin/sh
@ -63,7 +63,7 @@ ext-so:
.PHONY: compile-c
compile-c:
@echo "$(COMP_C)"
@echo "$(COMPILE_C)"
.PHONY: compile-cxx
compile-cxx:

10
wmake/src/Makefile
View File

@ -32,13 +32,13 @@
#------------------------------------------------------------------------------
#------------------------------------------------------------------------------
# The Makefile use a POSIX shell
# Use POSIX shell
#------------------------------------------------------------------------------
SHELL = /bin/sh
SHELL = /bin/sh
#------------------------------------------------------------------------------
# Unset suffices list (suffix rules are not used)
# No default suffix rules used
#------------------------------------------------------------------------------
.SUFFIXES:
@ -62,10 +62,10 @@ include $(GENERAL_RULES)/general
.PHONY: all clean
all: $(WMAKE_BIN)/dirToString $(WMAKE_BIN)/wmkdep $(WMAKE_BIN)/wmkdepend
@echo built wmake-bin for $(WM_ARCH)$(WM_COMPILER)
@echo "built wmake-bin for $(WM_ARCH)$(WM_COMPILER)"
clean:
@echo clean wmake-bin for $(WM_ARCH)$(WM_COMPILER)
@echo "clean wmake-bin for $(WM_ARCH)$(WM_COMPILER)"
@rm -rf $(WMAKE_BIN) 2>/dev/null
@rmdir $(shell dirname $(WMAKE_BIN)) 2>/dev/null || true