diff --git a/configure b/configure index 8b284b8e6a6ff5af329ad0a1da39ed79cad353c9..b34c8afb1697fe5f827dd7ce3f712409fe65d6ea 100755 --- a/configure +++ b/configure @@ -1,10 +1,11 @@ -#!/bin/sh +#!/bin/bash # configure script # # # Because we moved to cmake this script emulate the configure script from autotools conf_options= +ld_lib_pathopt= # Avoid depending upon Character Ranges. as_cr_letters='abcdefghijklmnopqrstuvwxyz' @@ -99,12 +100,15 @@ enable_debug with_metis with_hdf5 with_libhilbert +enable_cuda_on_cpu enable_scan_coverty enable_test_performance enable_test_coverage with_parmetis enable_se_class1 +enable_se_class2 enable_se_class3 +with_alpaka with_action_on_error with_boost with_boost_libdir @@ -116,7 +120,9 @@ with_lapack with_suitesparse with_petsc with_eigen +with_vcdevel enable_gpu +enable_asan ' rm -rf build @@ -124,6 +130,8 @@ if [ ! -d "build" ]; then mkdir build fi +echo "/usr/local" > install_dir + ##### Go over all options for ac_option do @@ -219,12 +227,24 @@ do se_class1) conf_options="$conf_options -DSE_CLASS1=ON" ;; + se_class2) + conf_options="$conf_options -DSE_CLASS2=ON" + ;; se_class3) conf_options="$conf_options -DSE_CLASS3=ON" ;; test_coverage) conf_options="$conf_options -DTEST_COVERAGE=ON" ;; + scan_coverty) + conf_options="$conf_options -DSCAN_COVERTY=ON" + ;; + cuda_on_cpu) + conf_options="$conf_options -DCUDA_ON_CPU=ON" + ;; + test_performance) + conf_options="$conf_options -DTEST_PERFORMANCE=ON" + ;; gpu) if [ x"$CXX" == x"" ]; then conf_options="$conf_options" @@ -233,6 +253,9 @@ do fi conf_options="$conf_options -DENABLE_GPU=ON" ;; + asan) + conf_options="$conf_options -DENABLE_ASAN=ON" + ;; *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig" ac_unrecognized_sep=', ' ;; @@ -458,16 +481,26 @@ do ;; suitesparse) conf_options="$conf_options -DSUITESPARSE_ROOT=$ac_optarg" + ld_lib_pathopt=$ac_optarg/lib ;; eigen) conf_options="$conf_options -DEIGEN3_ROOT=$ac_optarg" ;; boost) - conf_options="$conf_options -DBOOST_ROOT=$ac_optarg" + conf_options="$conf_options -DBOOST_ROOT=$ac_optarg -DBoost_NO_BOOST_CMAKE=ON" + ;; + action_on_error) + conf_options="$conf_options -DACTION_ON_ERROR=$ac_optarg" ;; mpivendor) conf_options="$conf_options -DMPI_VENDOR=$ac_optarg" ;; + vcdevel) + conf_options="$conf_options -DVc_ROOT=$ac_optarg" + ;; + alpaka) + conf_options="$conf_options -DALPAKA_ROOT=$ac_optarg" + ;; *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig" ac_unrecognized_sep=', ';; esac @@ -541,7 +574,7 @@ cd build ## remove enerything echo "Calling cmake ../. $conf_options" rm ../error_code -cmake ../. $conf_options +DYLD_LIBRARY_PATH=$ld_lib_pathopt cmake ../. $conf_options if [ $? != 0 ]; then #ok something went wrong the install script analyze the return code to potentially fix the problem automatically # Read the error code and exit with that