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

ENH: build into build/ directory instead of platforms/ (issue #312)

Browse Source 
- makes it slightly easier when packaging various binaries, or when
  building packages for installation via modules etc.
This commit is contained in:
Mark Olesen
2017-02-10 20:30:15 +01:00
committed by mark
parent 3d02c8a530
commit 957635200a
6 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
wmake/scripts/wmakeFunctions
View File

@ -160,7 +160,7 @@ findObjectDir()
case "$exPath" in
("$wmpdir"/*)
local buildPath=$WM_PROJECT_DIR/platforms/${WM_OPTIONS}
local buildPath=$WM_PROJECT_DIR/build/${WM_OPTIONS}
objectsDir=$buildPath$(echo $exPath | sed s%$wmpdir%% )
;;
(*)
@ -208,8 +208,8 @@ then
depToSource()
{
local sourceFile=${1%.dep}
sourceFile="${sourceFile/platforms\/${WM_OPTIONS}\//}"
sourceFile="${sourceFile/platforms\/${WM_OPTIONS}${WM_MPLIB}\//}"
sourceFile="${sourceFile/build\/${WM_OPTIONS}\//}"
sourceFile="${sourceFile/build\/${WM_OPTIONS}${WM_MPLIB}\//}"
sourceFile="${sourceFile/Make\/${WM_OPTIONS}\//}"
sourceFile="${sourceFile/Make\/${WM_OPTIONS}${WM_MPLIB}\//}"
@ -218,10 +218,10 @@ then
else
depToSource()
{
local sourceFile=$(echo ${1%.dep} | \
sed -e s%platforms/${WM_OPTIONS}/%% \
-e s%platforms/${WM_OPTIONS}${WM_MPLIB}/%% \
-e s%Make/${WM_OPTIONS}/%% \
local sourceFile=$(echo ${1%.dep} | \
sed -e s%build/${WM_OPTIONS}/%% \
-e s%build/${WM_OPTIONS}${WM_MPLIB}/%% \
-e s%Make/${WM_OPTIONS}/%% \
-e s%Make/${WM_OPTIONS}${WM_MPLIB}/%% )
echo "$sourceFile"