Skip to content
GitLab
Explore
Sign in
Register
This is an archived project. Repository and other project resources are read-only.
Commits on Source (1)
ENH: improve installation handling
· 9009a8c2
Mark OLESEN
authored
May 06, 2020
- handle -prefix=DIR for specifying installation locations outside of the regular OpenFOAM tree.
9009a8c2
Hide whitespace changes
Inline
Side-by-side
Allwmake
View file @
9009a8c2
#!/bin/sh
cd
${
0
%/*
}
||
exit
1
# Run from this directory
cd
"
${
0
%/*
}
"
||
exit
# Run from this directory
targetType
=
libso
.
$WM_PROJECT_DIR
/wmake/scripts/AllwmakeParseArguments
.
${
WM_PROJECT_DIR
:?
}
/wmake/scripts/wmake.cmake-args
.
${
WM_PROJECT_DIR
:?
}
/wmake/scripts/AllwmakeParseArguments
# -----------------------------------------------------------------------------
if
[
-n
"
$CMAKE_INSTALL_PREFIX
"
]
then
export
CMAKE_INSTALL_PREFIX
fi
#------------------------------------------------------------------------------
echo
"========================================"
...
...
src/Allwmake
View file @
9009a8c2
#!/bin/sh
cd
${
0
%/*
}
||
exit
1
# Run from this directory
.
$WM_PROJECT_DIR
/wmake/scripts/
All
wmake
ParseArgument
s
.
$WM_PROJECT_DIR
/wmake/scripts/
have_adios2
cd
"
${
0
%/*
}
"
||
exit
# Run from this directory
.
$
{
WM_PROJECT_DIR
:?
}
/wmake/scripts/wmake
.cmake-arg
s
.
$
{
WM_PROJECT_DIR
:?
}
/wmake/scripts/
AllwmakeParseArguments
.
${
WM_PROJECT_DIR
:?
}
/wmake/scripts/have_adios2
# -----------------------------------------------------------------------------
if
[
-n
"
$CMAKE_INSTALL_PREFIX
"
]
then
export
CMAKE_INSTALL_PREFIX
fi
#------------------------------------------------------------------------------
if
have_adios2
then
adiosFoam/Allwmake
...
...
src/adiosFoam/Allwmake
View file @
9009a8c2
#!/bin/sh
cd
${
0
%/*
}
||
exit
1
# Run from this directory
.
$WM_PROJECT_DIR
/wmake/scripts/
All
wmake
ParseArgument
s
.
$WM_PROJECT_DIR
/wmake/scripts/
have_adios2
cd
"
${
0
%/*
}
"
||
exit
# Run from this directory
.
$
{
WM_PROJECT_DIR
:?
}
/wmake/scripts/wmake
.cmake-arg
s
.
$
{
WM_PROJECT_DIR
:?
}
/wmake/scripts/
AllwmakeParseArguments
.
${
WM_PROJECT_DIR
:?
}
/wmake/scripts/have_adios2
# -----------------------------------------------------------------------------
if
[
-n
"
$CMAKE_INSTALL_PREFIX
"
]
then
export
CMAKE_INSTALL_PREFIX
fi
if
have_adios2
then
wmake libso
...
...
src/adiosFoam/Make/files
View file @
9009a8c2
...
...
@@ -16,4 +16,4 @@ write/adiosCoreWriteCloud.C
time/adiosTime.C
LIB = $(
FOAM_LIBBIN)
/libadiosFoam
LIB = $(
CMAKE_INSTALL_PREFIX)/lib
/libadiosFoam
src/adiosFoam/Make/options
View file @
9009a8c2
sinclude $(GENERAL_RULES)/ADIOS2
/* Default is PROJECT target */
ifeq (,$(CMAKE_INSTALL_PREFIX))
CMAKE_INSTALL_PREFIX := $(dir $(FOAM_LIBBIN))
endif
EXE_INC = \
$(PFLAGS) $(PINC) $(ADIOS_FLAGS) \
-I$(LIB_SRC)/meshTools/lnInclude \
...
...
src/adiosWrite/Allwmake
View file @
9009a8c2
#!/bin/sh
cd
${
0
%/*
}
||
exit
1
# Run from this directory
.
$WM_PROJECT_DIR
/wmake/scripts/
All
wmake
ParseArgument
s
.
$WM_PROJECT_DIR
/wmake/scripts/
have_adios2
cd
"
${
0
%/*
}
"
||
exit
# Run from this directory
.
$
{
WM_PROJECT_DIR
:?
}
/wmake/scripts/wmake
.cmake-arg
s
.
$
{
WM_PROJECT_DIR
:?
}
/wmake/scripts/
AllwmakeParseArguments
.
${
WM_PROJECT_DIR
:?
}
/wmake/scripts/have_adios2
# -----------------------------------------------------------------------------
if
[
-n
"
$CMAKE_INSTALL_PREFIX
"
]
then
export
CMAKE_INSTALL_PREFIX
fi
#------------------------------------------------------------------------------
if
have_adios2
then
#
e
xtra compile/link options
#
E
xtra compile/link options
adiosFoam
=
$(
cd
../adiosFoam
&&
pwd
-P
)
export
ADIOS_EXTRA_COMP
=
"-I
$adiosFoam
/lnInclude"
export
ADIOS_EXTRA_LINK
=
'-L$(FOAM_USER_LIBBIN) -ladiosFoam'
if
[
-n
"
$CMAKE_INSTALL_PREFIX
"
]
then
export
ADIOS_EXTRA_LINK
=
'-L$(CMAKE_INSTALL_PREFIX)/lib -ladiosFoam'
fi
wmake libso
else
echo
"==> skip adiosFoam library"
...
...
src/adiosWrite/Make/files
View file @
9009a8c2
...
...
@@ -2,4 +2,4 @@ adiosReadData.C
adiosWrite.C
adiosWriteData.C
LIB = $(
FOAM_LIBBIN)
/libadiosFunctionObjects
LIB = $(
CMAKE_INSTALL_PREFIX)/lib
/libadiosFunctionObjects
src/adiosWrite/Make/options
View file @
9009a8c2
sinclude $(GENERAL_RULES)/ADIOS2
/* Default is PROJECT target */
ifeq (,$(CMAKE_INSTALL_PREFIX))
CMAKE_INSTALL_PREFIX := $(dir $(FOAM_LIBBIN))
endif
EXE_INC = \
$(PFLAGS) $(PINC) $(ADIOS_FLAGS) \
${ADIOS_EXTRA_COMP} \
...
...