From: Eduardo DAVILA Date: Tue, 19 Sep 2017 14:49:55 +0000 (+0200) Subject: #3126 creaToolsTools Feature New Normal - branch changeWx28to30 compilation with... X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=c72564648c70e6b3acd9cc15da9cf886df77eb89;p=creaToolsTools.git #3126 creaToolsTools Feature New Normal - branch changeWx28to30 compilation with wxWidgets3 --- diff --git a/Linux/scripts/CreaTools-load.sh b/Linux/scripts/CreaTools-load.sh index d85a4b4..bfb7cfc 100644 --- a/Linux/scripts/CreaTools-load.sh +++ b/Linux/scripts/CreaTools-load.sh @@ -122,6 +122,12 @@ then bash $scriptDir/gitclone.sh $creatoolstoolssource $generationdir $sourcesFrom # bash $scriptDir/cvscheckout.sh $libidosource-ESRF $generationdir $cvsUserName # mv $libidosource-ESRF $libidosource + + cd $generationdir/creatools_source/$creasource + git checkout changeWx28to30 + + + fi if [ $sourcesFrom = HTML ] diff --git a/Linux/scripts/ThirdParty-install-Base-rpm.sh b/Linux/scripts/ThirdParty-install-Base-rpm.sh index 4439ccb..2b3072a 100644 --- a/Linux/scripts/ThirdParty-install-Base-rpm.sh +++ b/Linux/scripts/ThirdParty-install-Base-rpm.sh @@ -74,7 +74,7 @@ then yum install graphviz -y yum install texlive -y yum install latex2html -y - yum install wxGTK-devel wxBase -y + yum install wxGTK3-devel wxBase3 -y yum install boost-devel -y yum install sqlite-devel -y yum install qt-devel -y