EED cvs conflict

diff --git a/Install/scripts/creaImageIOVariables.sh b/Install/scripts/creaImageIOVariables.sh
index 59257bd2ffec7403e03ca0879f5c5ee4f47b834e..c14ebabf3a04d9411629c435ea16c44bc6c305ff 100644 (file)
--- a/Install/scripts/creaImageIOVariables.sh
+++ b/Install/scripts/creaImageIOVariables.sh
@@ -8,8 +8,9 @@ currentdir=$2
 binfolder=$2/tmpCreaTools_INSTALL/$1Bin
 cd $binfolder
 
-cmake -D BBTK_DIR:PATH=$currentdir/tmpCreaTools_INSTALL/bbtkBin  CMakeCache.txt
 cmake -D crea_DIR:PATH=$currentdir/tmpCreaTools_INSTALL/creaBin  CMakeCache.txt
+cmake -D BBTK_DIR:PATH=$currentdir/tmpCreaTools_INSTALL/bbtkBin  CMakeCache.txt
+cmake -D creaBruker_DIR:PATH=$currentdir/tmpCreaTools_INSTALL/creaBrukerBin  CMakeCache.txt
 cmake -D BUILD_BBTK_PACKAGE_creaImageIO:BOOL=ON                  CMakeCache.txt
 cmake -D BUILD_creaImageIO_DOC:BOOL=$3                           CMakeCache.txt
 cmake -D BUILD_BBTK_PACKAGE_creaImageIO_DOXYGEN_DOC:BOOL=$3      CMakeCache.txt