Skip to content
Permalink
Browse files

Turn off tetgen build by default. Add option to turn on tetgen build …

…to build.sh script.
  • Loading branch information...
ayla
ayla committed Mar 11, 2016
1 parent 20bed53 commit f7a77cc092d8235dc32756dc86a7ea8ed1199769
Showing with 10 additions and 6 deletions.
  1. +2 −3 Superbuild/Superbuild.cmake
  2. +8 −3 build.sh
@@ -71,9 +71,8 @@ OPTION(BUILD_TESTING "Build with tests." ON)
OPTION(BUILD_WITH_PYTHON "Build with python support." ON)

###########################################
# Configure python
OPTION(WITH_TETGEN "Build Tetgen." ON)
MARK_AS_ADVANCED(WITH_TETGEN)
# Configure tetgen
OPTION(WITH_TETGEN "Build Tetgen." OFF)

###########################################
# Configure Windows executable to run with
@@ -63,6 +63,7 @@ printhelp() {
echo -e "--verbose\t\tTurn on verbose build"
# echo -e "--set-osx-version-min\tTarget a minimum Mac OS X version (currently ${OSX_TARGET_VERSION}, ${OSX_TARGET_ARCH}) [OS X only]"
# echo -e "--xcode-build\t\tConfigure and build Xcode project against ALL_BUILD target [OS X only]"
echo -e "--with-tetgen\t\tBuild SCIRun with Tetgen library"
echo -e "--cmake=<path to cmake>\t\tUse given CMake"
echo -e "--cmake-args=<cmake args>\t\tUse given CMake args"
echo -e "--documentation\t\tEnable building documentation (requires LaTeX)"
@@ -169,7 +170,7 @@ find_cmake() {

# handle both types of OS X generators
configure_scirun_osx() {
local build_opts=$1
local build_opts=$@

if [[ $setosxmin -eq 1 ]]; then
build_opts="${build_opts} -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=${OSX_TARGET_VERSION} -DCMAKE_OSX_SYSROOT:PATH=${OSX_TARGET_VERSION_SDK} -DCMAKE_OSX_ARCHITECTURES:STRING=${OSX_TARGET_ARCH}"
@@ -184,7 +185,7 @@ configure_scirun_osx() {

# generic Unix makefile build
configure_scirun_make() {
local build_opts=$1
local build_opts=$@

build_opts="${build_opts} -DCMAKE_BUILD_TYPE:STRING=${buildtype} -DCMAKE_VERBOSE_MAKEFILE:BOOL=${verbosebuild}"

@@ -198,7 +199,7 @@ configure_scirun() {
fi
try cd $builddir

local COMMON_BUILD_OPTS="-DBUILD_DOCUMENTATION:BOOL=$documentation"
local COMMON_BUILD_OPTS="-DWITH_TETGEN:BOOL=$tetgenbuild -DBUILD_DOCUMENTATION:BOOL=$documentation"

if [[ $osx -eq 1 ]]; then
configure_scirun_osx $COMMON_BUILD_OPTS
@@ -268,6 +269,8 @@ verbosebuild="OFF"
builddir="$DIR/bin"
xcodebuild=0
documentation="OFF"
# currently off by default
tetgenbuild="OFF"

echo "Parsing arguments..."
while [[ $1 != "" ]]; do
@@ -308,6 +311,8 @@ while [[ $1 != "" ]]; do
else
echo "WARNING: Only OS X supports the --xcode-build flag."
fi;;
--with-tetgen)
tetgenbuild="ON";;
--documentation)
documentation="ON";;
-j*)

0 comments on commit f7a77cc

Please sign in to comment.
You can’t perform that action at this time.