From 70e4a11737ac08e0eedaba63885e91c972bda4d1 Mon Sep 17 00:00:00 2001 From: Leonardo Florez-Valencia Date: Mon, 25 Apr 2016 15:13:26 -0500 Subject: [PATCH] ... --- third_party_installers/cpPlugins_Install_ITK.sh | 11 ++++++----- third_party_installers/cpPlugins_Install_QT4.sh | 11 ++++++----- third_party_installers/cpPlugins_Install_VTK.sh | 11 ++++++----- 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/third_party_installers/cpPlugins_Install_ITK.sh b/third_party_installers/cpPlugins_Install_ITK.sh index d716a85..8529fed 100755 --- a/third_party_installers/cpPlugins_Install_ITK.sh +++ b/third_party_installers/cpPlugins_Install_ITK.sh @@ -20,7 +20,6 @@ function abspath() ## Some configuration variables number_of_processes="-j4" -comp_type=Debug ## Locate cmake executable cmake_locations=("/usr/bin" "/usr/local/bin" "${HOME}/local/bin") @@ -43,7 +42,7 @@ if [ ! -x $cmake_exec ]; then fi ## Check input parameters and process inputs (if needed) -if [ "$#" -eq 1 ]; then +if [ "$#" -eq 2 ]; then valid_extensions=("zip" "tar" "tar.gz" "tar.bz2") actual_ext="" for ext in ${valid_extensions[@]}; do @@ -80,11 +79,13 @@ if [ "$#" -eq 1 ]; then exit 1 fi echo "done!" -elif [ "$#" -eq 2 ]; then + build_type=$2 +elif [ "$#" -eq 3 ]; then source_dir=`dirname $1` build_dir=`dirname $2` + build_type=$3 else - echo "Usage: [itk_package] or [itk_source_dir itk_build_dir]" + echo "Usage: [itk_package] or [itk_source_dir itk_build_dir] [build_type]" fi echo "Given source dir : \"$source_dir\"" @@ -98,7 +99,7 @@ $cmake_exec \ -DBUILD_EXAMPLES:BOOL=OFF \ -DBUILD_SHARED_LIBS:BOOL=ON \ -DBUILD_TESTING:BOOL=OFF \ - -DCMAKE_BUILD_TYPE:STRING=$comp_type \ + -DCMAKE_BUILD_TYPE:STRING=$build_type \ -DModule_ITKReview:BOOL=ON \ -DModule_ITKVtkGlue:BOOL=OFF \ -DCMAKE_INSTALL_PREFIX:PATH=${HOME}/local \ diff --git a/third_party_installers/cpPlugins_Install_QT4.sh b/third_party_installers/cpPlugins_Install_QT4.sh index 6d2c30d..76fddde 100755 --- a/third_party_installers/cpPlugins_Install_QT4.sh +++ b/third_party_installers/cpPlugins_Install_QT4.sh @@ -20,7 +20,6 @@ function abspath() ## Some configuration variables number_of_processes="-j4" -comp_type=-debug platform=`uname` particular_options="" if [ "$platform" == "Darwin" ]; then @@ -28,7 +27,7 @@ if [ "$platform" == "Darwin" ]; then fi ## Check input parameters and process inputs (if needed) -if [ "$#" -eq 1 ]; then +if [ "$#" -eq 2 ]; then valid_extensions=("zip" "tar" "tar.gz" "tar.bz2") actual_ext="" for ext in ${valid_extensions[@]}; do @@ -65,11 +64,13 @@ if [ "$#" -eq 1 ]; then exit 1 fi echo "done!" -elif [ "$#" -eq 2 ]; then + build_type=$2 +elif [ "$#" -eq 3 ]; then source_dir=`dirname $1` build_dir=`dirname $2` + build_type=$3 else - echo "Usage: [qt4_package] or [qt4_source_dir qt4_build_dir]" + echo "Usage: [qt4_package] or [qt4_source_dir qt4_build_dir] [build_type]" fi echo "Given source dir : \"$source_dir\"" @@ -79,7 +80,7 @@ echo "Configuring sources... " cd $build_dir $source_dir/configure \ -prefix ${HOME}/local \ - $comp_type \ + $build_type \ -opensource -shared -fast \ -no-phonon \ -no-phonon-backend \ diff --git a/third_party_installers/cpPlugins_Install_VTK.sh b/third_party_installers/cpPlugins_Install_VTK.sh index 0812809..d5e9958 100755 --- a/third_party_installers/cpPlugins_Install_VTK.sh +++ b/third_party_installers/cpPlugins_Install_VTK.sh @@ -20,7 +20,6 @@ function abspath() ## Some configuration variables number_of_processes="-j4" -comp_type=Debug ## Locate cmake executable cmake_locations=("/usr/bin" "/usr/local/bin" "${HOME}/local/bin") @@ -61,7 +60,7 @@ if [ ! -x $qmake_exec ]; then fi ## Check input parameters and process inputs (if needed) -if [ "$#" -eq 1 ]; then +if [ "$#" -eq 2 ]; then valid_extensions=("zip" "tar" "tar.gz" "tar.bz2") actual_ext="" for ext in ${valid_extensions[@]}; do @@ -98,11 +97,13 @@ if [ "$#" -eq 1 ]; then exit 1 fi echo "done!" -elif [ "$#" -eq 2 ]; then + build_type=$2 +elif [ "$#" -eq 3 ]; then source_dir=`dirname $1` build_dir=`dirname $2` + build_type=$3 else - echo "Usage: [vtk_package] or [vtk_source_dir vtk_build_dir]" + echo "Usage: [vtk_package] or [vtk_source_dir vtk_build_dir] [build_type]" fi echo "Given source dir : \"$source_dir\"" @@ -117,7 +118,7 @@ $cmake_exec \ -DBUILD_SHARED_LIBS:BOOL=ON \ -DBUILD_TESTING:BOOL=OFF \ -DQT_QMAKE_EXECUTABLE:PATH=$qmake_exec \ - -DCMAKE_BUILD_TYPE:STRING=$comp_type \ + -DCMAKE_BUILD_TYPE:STRING=$build_type \ -DModule_vtkGUISupportQt:BOOL=ON \ -DModule_vtkGUISupportQtOpenGL:BOOL=ON \ -DModule_vtkGUISupportQtSQL:BOOL=OFF \ -- 2.47.1