From: Eduardo DAVILA <davila@localhost.localdomain>
Date: Wed, 17 Jan 2018 13:37:25 +0000 (+0100)
Subject: #3154 creaToolsTools Feature New Normal branch mxecc
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=6f869f6b49344ab0e5f9b838c5ea2da13ccb924d;p=creaToolsTools.git

#3154 creaToolsTools Feature New Normal branch mxecc
---

diff --git a/Linux-mxe/compile-cretools.sh b/Linux-mxe/compile-cretools.sh
deleted file mode 100644
index 4aa2557..0000000
--- a/Linux-mxe/compile-cretools.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-baseDir="$(pwd)"
-
-cd scripts
-source config.sh
-source cloneGit.sh
-mkdir $creatoolsBin 
-source compile_crea.sh
-cd $baseDir
diff --git a/Linux-mxe/scripts/cloneGit.sh b/Linux-mxe/scripts/cloneGit.sh
index 7a44340..43c2ce5 100644
--- a/Linux-mxe/scripts/cloneGit.sh
+++ b/Linux-mxe/scripts/cloneGit.sh
@@ -6,12 +6,13 @@ git clone ssh://gitolite@git.creatis.insa-lyon.fr/crea
 git clone ssh://gitolite@git.creatis.insa-lyon.fr/bbtk
 
 cd crea
-git checkout vtk7itk4wx3
+git checkout vtk7itk4wx3-mxecc
 cd ..
 
 cd bbtk 
-git checkout vtk7itk4wx3
+git checkout vtk7itk4wx3-mxecc
 cd ..
 
 cd $baseDir/scripts
 
+
diff --git a/Linux-mxe/scripts/compile_crea.sh b/Linux-mxe/scripts/compile_crea.sh
index 171ba48..3be1179 100644
--- a/Linux-mxe/scripts/compile_crea.sh
+++ b/Linux-mxe/scripts/compile_crea.sh
@@ -7,9 +7,9 @@ rm -rf $moduleBin
 mkdir $moduleBin
 cd $moduleBin
 $cmakeVar $creatoolsSource/$module
-$cmakeVar -D CREA_BUILD_VTK:BOOL=ON -D CREA_BUILD_WX:BOOL=ON CMakeCache.txt
+$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  CMakeCache.txt
-$cmakeVar  CMakeCache.txt
-make -j5
+make -j$corenumber
 cd $baseDir/scripts
 
diff --git a/Linux-mxe/scripts/config.sh b/Linux-mxe/scripts/config.sh
index 0512b23..716d9ca 100644
--- a/Linux-mxe/scripts/config.sh
+++ b/Linux-mxe/scripts/config.sh
@@ -1,5 +1,7 @@
-creatoolsSource=/tmpEED/creaTools-mxe/cs
-creatoolsInstall=/tmpEED/creaTools-mxe/ci
-creatoolsBin=/tmpEED/creaTools-mxe/cb
-cmakeVar=/tmpEED/creaTools-mxe/mxe/usr/bin/x86_64-w64-mingw32.shared-cmake
+creatoolsBase=/tmpEED/creaTools-mxe
 
+creatoolsSource=$creatoolsBase/cs
+creatoolsInstall=$creatoolsBase/ci
+creatoolsBin=$creatoolsBase/cb
+cmakeVar=$creatoolsBase/mxe/usr/bin/x86_64-w64-mingw32.shared-cmake
+corenumber=`getncore`