From: jean-pierre roux Date: Mon, 11 Oct 2010 15:09:11 +0000 (+0000) Subject: WTF? X-Git-Tag: Creatools2-0-3.creaToolsTools2-0-3.17Feb2011~123 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=9b6bc4d8f7073fe96d4d35c9c1ce01461400506f;p=creaToolsTools.git WTF? --- diff --git a/Install/scripts/cmakemod.sh b/Install/scripts/cmakemod.sh index 4f885de..df73b0f 100644 --- a/Install/scripts/cmakemod.sh +++ b/Install/scripts/cmakemod.sh @@ -36,10 +36,10 @@ cmake -G"Unix Makefiles" -H$currentdir/creatools_source/$1 -B$dirInstall/ cmake -D BUILD_ALL:BOOL=ON -D USE_DEBUG_LIB:BOOL=$buildType -D CMAKE_INSTALL_LIBDIR:PATH=$install_lib_dir CMakeCache.txt # the following line is the right one! -#cmake -D INCLUDE_CTEST:BOOL=ON -D CMAKE_INSTALL_PREFIX:PATH=$dirInstall -D crea_DIR:PATH=$currentdir/creatools_source/creaBin CMakeCache.txt +#cmake -D INCLUDE_CTEST:BOOL=ON -D CMAKE_INSTALL_PREFIX:PATH=$dirInstall -D crea_DIR:PATH=$currentdir/creatools_bin/creaBin CMakeCache.txt # This one : only for misinstalled vtk: # modify VTK_DIR:PATH=, acording to your own computer -cmake -D INCLUDE_CTEST:BOOL=ON -D BBTK_USE_WXWIDGETS:BOOL=ON -D VTK_DIR:PATH=$VTKdir -D crea_DIR:PATH=$currentdir/creatools_source/creaBin -D BBTK_DIR:PATH=$currentdir/creatools_source/bbtkBin -D CMAKE_INSTALL_PREFIX:PATH=$installPrefix CMakeCache.txt +cmake -D INCLUDE_CTEST:BOOL=ON -D BBTK_USE_WXWIDGETS:BOOL=ON -D VTK_DIR:PATH=$VTKdir -D crea_DIR:PATH=$currentdir/creatools_bin/creaBin -D BBTK_DIR:PATH=$currentdir/creatools_bin/bbtkBin -D CMAKE_INSTALL_PREFIX:PATH=$installPrefix CMakeCache.txt cd .. diff --git a/Install/scripts/creaMaracasVariables.sh b/Install/scripts/creaMaracasVariables.sh index e363208..fcbcd25 100644 --- a/Install/scripts/creaMaracasVariables.sh +++ b/Install/scripts/creaMaracasVariables.sh @@ -8,8 +8,8 @@ currentdir=$2 binfolder=$2/creatools_bin/$1Bin cd $binfolder -cmake -D BBTK_DIR:PATH=$currentdir/creatools_bin/bbtkBin CMakeCache.txt -cmake -D crea_DIR:PATH=$currentdir/creatools_bin/creaBin CMakeCache.txt +cmake -D BBTK_DIR:PATH=$currentdir/creatools_bin/bbtkBin CMakeCache.txt +cmake -D crea_DIR:PATH=$currentdir/creatools_bin/creaBin CMakeCache.txt cmake -D BUILD_BBTK_PACKAGE_creaMaracasVisu:BOOL=ON CMakeCache.txt cmake -D creaMaracasVisu_DOC:BOOL=$3 CMakeCache.txt cmake -D BUILD_BBTK_PACKAGE_creaMaracasVisu_DOXYGEN_DOC:BOOL=$3 CMakeCache.txt