#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 (file)
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 7a44340b3cdb68af32f2530e4b7dde2eb5a432ba..43c2ce55ddb62eeda191de3076f871f863fce1e1 100644 (file)
--- 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 171ba481143bda990a5abd484243ec49ef0afb20..3be11796c52affed96711b3aa68fc90e2517e58e 100644 (file)
--- 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 0512b23e1f2508f35998df82797376dc61b3da82..716d9ca296b0e4cb603c6c340f02940737c2a5b2 100644 (file)
--- 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`