From: Eduardo Davila Date: Thu, 7 Oct 2010 08:00:25 +0000 (+0000) Subject: EED cvs conflict X-Git-Tag: CREATOOLS.2-0-3~7 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=a8a68ca1cfe3171654edea57347b5e09cd31f668;p=creaToolsTools.git EED cvs conflict --- diff --git a/Install/scripts/creaImageIOVariables.sh b/Install/scripts/creaImageIOVariables.sh index 59257bd..c14ebab 100644 --- 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