mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-11-28 03:28:01 +00:00
ENH: support FOAM_MODULE_PREFIX to guide location of module builds (#1721)
- When compiling additional modules or user code, we need more control
for the installation locations beyond the usual FOAM_USER_LIBBIN,
FOAM_SITE_LIBBIN, FOAM_LIBBIN, and wish to have these values be
modifiable without editing files.
- provide wmake rules for handling standard defaults:
* GENERAL_RULES/module-path-user
* GENERAL_RULES/module-path-group
* GENERAL_RULES/module-path-project
which are incorporated as follows:
Make/options:
include $(GENERAL_RULES)/module-path-user
Make/files:
LIB = $(FOAM_MODULE_LIBBIN)/libMyLibrary
By default these would compile into FOAM_USER_{APPBIN,LIBBIN} but
could be adjusted at compilation time. For example,
```
wmake -module-prefix=/path/my-install-location
```
Or
```
./Allwmake -module-prefix=/path/my-install-location
./Allwmake -prefix=/path/my-install-location
```
Or
```
FOAM_MODULE_PREFIX=/path/my-install-location ./Allwmake
```
ENH: add -no-recursion option for AllwmakeParseArguments
- more descriptive naming than the -fromWmake option (still supported)
- remove wmake/scripts/wmake.{cmake,wmake}-args since the -prefix
handling and -no-recursion is now directly handled by AllwmakeParseArguments
This commit is contained in:
21
wmake/rules/General/module-path-group
Normal file
21
wmake/rules/General/module-path-group
Normal file
@ -0,0 +1,21 @@
|
||||
# ----------------------------------------------------------------------------
|
||||
# Set defaults for FOAM_MODULE_APPBIN, FOAM_MODULE_LIBBIN
|
||||
# based on group locations
|
||||
#
|
||||
# FOAM_MODULE_APPBIN ?= FOAM_SITE_APPBIN
|
||||
# FOAM_MODULE_LIBBIN ?= FOAM_SITE_LIBBIN
|
||||
#
|
||||
# See: GENERAL_RULES/module-path-prefix
|
||||
# ----------------------------------------------------------------------------
|
||||
|
||||
include $(GENERAL_RULES)/module-path-prefix
|
||||
|
||||
ifeq (,$(strip $(FOAM_MODULE_APPBIN)))
|
||||
FOAM_MODULE_APPBIN = $(FOAM_SITE_APPBIN)
|
||||
endif
|
||||
|
||||
ifeq (,$(strip $(FOAM_MODULE_LIBBIN)))
|
||||
FOAM_MODULE_LIBBIN = $(FOAM_SITE_LIBBIN)
|
||||
endif
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
Reference in New Issue
Block a user