From 69bc72550dca79fe2bf1781197e391e4a7024c84 Mon Sep 17 00:00:00 2001 From: Eduardo DAVILA Date: Mon, 22 Jan 2018 16:07:18 +0100 Subject: [PATCH] #3154 creaToolsTools Feature New - Normalbranch mxecc --- Linux-mxe/compile-creatools.sh | 6 ++++-- Linux-mxe/scripts/compile_bbtk.sh | 17 +++++++++++++++++ Linux-mxe/scripts/compile_crea.sh | 3 ++- Linux-mxe/scripts/config.sh | 14 ++++++++++++++ 4 files changed, 37 insertions(+), 3 deletions(-) create mode 100644 Linux-mxe/scripts/compile_bbtk.sh diff --git a/Linux-mxe/compile-creatools.sh b/Linux-mxe/compile-creatools.sh index b634c66..a05415a 100644 --- a/Linux-mxe/compile-creatools.sh +++ b/Linux-mxe/compile-creatools.sh @@ -1,7 +1,9 @@ baseDir="$(pwd)" cd scripts source config.sh -# source cloneGit.sh + +#source cloneGit.sh mkdir $creatoolsBin -source compile_crea.sh +#source compile_crea.sh +source compile_bbtk.sh cd $baseDir diff --git a/Linux-mxe/scripts/compile_bbtk.sh b/Linux-mxe/scripts/compile_bbtk.sh new file mode 100644 index 0000000..548a8e6 --- /dev/null +++ b/Linux-mxe/scripts/compile_bbtk.sh @@ -0,0 +1,17 @@ + +module=bbtk +moduleBin=bbtkBin + +cd $creatoolsBin +rm -rf $moduleBin +mkdir $moduleBin +cd $moduleBin +$cmakeVar $creatoolsSource/$module +$cmakeVar -D --BUILD_ALL:BOOL=ON -D crea_DIR:PATH=$creatoolsInstall CMakeCache.txt +$cmakeVar -D BUILD_BBTK_DOC:BOOL=FALSE -D BUILD_BBTK_DOC_GUIDES_HTML:BOOL=FALSE -D BUILD_BBTK_DOC_GUIDES_PDF:BOOL=FALSE -D BUILD_BBTK_DOC_DOXYGEN:BOOL=FALSE -D BUILD_BBTK_DOC_PACKAGE:BOOL=FALSE CMakeCache.txt +$cmakeVar -D CMAKE_INSTALL_PREFIX:PATH=$creatoolsInstall -D CMAKE_VERBOSE_MAKEFILE:BOOL=ON + +$cmakeVar CMakeCache.txt +make -j$corenumber +cd $baseDir/scripts + diff --git a/Linux-mxe/scripts/compile_crea.sh b/Linux-mxe/scripts/compile_crea.sh index 3be1179..bc7e249 100644 --- a/Linux-mxe/scripts/compile_crea.sh +++ b/Linux-mxe/scripts/compile_crea.sh @@ -8,8 +8,9 @@ mkdir $moduleBin cd $moduleBin $cmakeVar $creatoolsSource/$module $cmakeVar -D CREA_BUILD_VTK:BOOL=ON -D CREA_USE_MXE:BOOL=ON -D CREA_BUILD_WX:BOOL=ON CMakeCache.txt -$cmakeVar -D CMAKE_VERBOSE_MAKEFILE:BOOL=ON CMakeCache.txt +$cmakeVar -D CMAKE_INSTALL_PREFIX:PATH=$creatoolsInstall -D CMAKE_VERBOSE_MAKEFILE:BOOL=ON CMakeCache.txt $cmakeVar CMakeCache.txt make -j$corenumber +make install cd $baseDir/scripts diff --git a/Linux-mxe/scripts/config.sh b/Linux-mxe/scripts/config.sh index 716d9ca..2cda9e7 100644 --- a/Linux-mxe/scripts/config.sh +++ b/Linux-mxe/scripts/config.sh @@ -1,5 +1,19 @@ creatoolsBase=/tmpEED/creaTools-mxe + +########################################### +function getncore { + if [ `uname` == Darwin ] ; then # MacOS + system_profiler | grep Processor | awk '$1=="Number" {print $4}' + else + cat /proc/cpuinfo | grep processor | wc -l + fi +} + + + + + creatoolsSource=$creatoolsBase/cs creatoolsInstall=$creatoolsBase/ci creatoolsBin=$creatoolsBase/cb -- 2.47.1