#3154 creaToolsTools Feature New - Normalbranch mxecc

diff --git a/Linux-mxe/compile-creatools.sh b/Linux-mxe/compile-creatools.sh
index b634c66ebdb042e784fa71fe2333cbdce96ea530..a05415a4479ea62e02538592f76711c0995635b0 100644 (file)
--- 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 (file)
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 3be11796c52affed96711b3aa68fc90e2517e58e..bc7e249d2182a4aed2108e9c0895b39235ab33fe 100644 (file)
--- 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 716d9ca296b0e4cb603c6c340f02940737c2a5b2..2cda9e7f08fe3c9d5b4e975b132314859f41b41b 100644 (file)
--- 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