mirror of
https://develop.openfoam.com/Development/ThirdParty-common.git
synced 2025-12-08 06:57:50 +00:00
ENH: delay testing of FOAM_EXT_LIBBIN
- only test in the packages that actually require it. State as a requirement. ENH: skip build of packages with known mingw issues - primarily kahip and pt-scotch. Others may also have issues, but for these we tend to use system packages anyhow. ENH: add '-force' option to various scripts - overrides some _lazy_ build logic
This commit is contained in:
17
makeCmake
17
makeCmake
@ -45,6 +45,7 @@ usage() {
|
||||
|
||||
usage: ${0##*/} [OPTION] cmake-VERSION
|
||||
options:
|
||||
-force Force compilation, even if binary already exists
|
||||
-gcc Force use of gcc/g++
|
||||
-link Create additional symlink as 'cmake-system'
|
||||
-help
|
||||
@ -59,7 +60,8 @@ USAGE
|
||||
#------------------------------------------------------------------------------
|
||||
exportCompiler # Compiler info for CMake/configure
|
||||
|
||||
unset optLink
|
||||
unset optForce optLink
|
||||
|
||||
# Parse options
|
||||
while [ "$#" -gt 0 ]
|
||||
do
|
||||
@ -67,10 +69,9 @@ do
|
||||
'') ;; # Ignore empty
|
||||
-h | -help) usage ;;
|
||||
-gcc) useGcc ;;
|
||||
-force) optForce=true ;;
|
||||
-link) optLink=true ;;
|
||||
|
||||
-link)
|
||||
optLink=true
|
||||
;;
|
||||
cmake-[0-9]*)
|
||||
cmakePACKAGE="${1%%/}"
|
||||
;;
|
||||
@ -97,7 +98,9 @@ fi
|
||||
CMAKE_SOURCE_DIR=$sourceBASE/$cmakePACKAGE
|
||||
CMAKE_ARCH_PATH=$installBASE/$cmakePACKAGE
|
||||
|
||||
if [ -d "$CMAKE_ARCH_PATH" -a -r "$CMAKE_ARCH_PATH/bin/cmake" ]
|
||||
if [ -z "$optForce" ] \
|
||||
&& [ -d "$CMAKE_ARCH_PATH" ] \
|
||||
&& [ -r "$CMAKE_ARCH_PATH/bin/cmake" ]
|
||||
then
|
||||
echo "Already built: $cmakePACKAGE"
|
||||
else
|
||||
@ -124,7 +127,7 @@ else
|
||||
}
|
||||
fi
|
||||
|
||||
if [ "$optLink" = true -a -x "$CMAKE_ARCH_PATH/bin/cmake" ]
|
||||
if [ "$optLink" = true ] && [ -x "$CMAKE_ARCH_PATH/bin/cmake" ]
|
||||
then
|
||||
(
|
||||
cd "${CMAKE_ARCH_PATH%/*}" || exit
|
||||
@ -135,7 +138,7 @@ then
|
||||
then
|
||||
exit 2
|
||||
fi
|
||||
ln -svf $cmakePACKAGE cmake-system
|
||||
ln -svf "$cmakePACKAGE" cmake-system
|
||||
)
|
||||
fi
|
||||
|
||||
|
||||
Reference in New Issue
Block a user