Salome HOME
projects
/
tools
/
install.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update
[tools/install.git]
/
src
/
SALOME_XmlHandler.cxx
diff --git
a/src/SALOME_XmlHandler.cxx
b/src/SALOME_XmlHandler.cxx
index bd58546f3b199697878ace24c57d85b75258ec53..3eca49f9f2034ff9f9b222bdf142eda268ee7bdd 100644
(file)
--- a/
src/SALOME_XmlHandler.cxx
+++ b/
src/SALOME_XmlHandler.cxx
@@
-3,7
+3,7
@@
// Author : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com)
// Project : SALOME
// Module : Installation Wizard
// Author : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com)
// Project : SALOME
// Module : Installation Wizard
-// Copyright : 2002-200
8
CEA
+// Copyright : 2002-200
9
CEA
#include "globals.h"
#include "globals.h"
@@
-144,7
+144,7
@@
void StructureParser::setTempDir( QLineEdit* dir )
// ================================================================
void StructureParser::getConfigInfo(const QDomElement &theElem)
{
// ================================================================
void StructureParser::getConfigInfo(const QDomElement &theElem)
{
- QString myVersion, myCaption, myCopyright, myLicense, myPlatforms;
+ QString myVersion, myCaption, myCopyright, myLicense, myPlatforms
, myOptLibs
;
if ( theElem.attribute( "version" ) ) {
myVersion = theElem.attribute( "version" ).stripWhiteSpace();
if ( myWizard && !myVersion.isEmpty() )
if ( theElem.attribute( "version" ) ) {
myVersion = theElem.attribute( "version" ).stripWhiteSpace();
if ( myWizard && !myVersion.isEmpty() )
@@
-178,6
+178,11
@@
void StructureParser::getConfigInfo(const QDomElement &theElem)
if ( myTempDir )
myTempDir->setText( substituteVars( theElem.attribute( "tempdir" ) ) );
}
if ( myTempDir )
myTempDir->setText( substituteVars( theElem.attribute( "tempdir" ) ) );
}
+ if ( theElem.attribute( "optionallibs" ) ) {
+ myOptLibs = theElem.attribute( "optionallibs" ).stripWhiteSpace();
+ if ( myWizard && !myOptLibs.isEmpty() )
+ myWizard->setOptionalLibs( myOptLibs );
+ }
}
// ================================================================
/*!
}
// ================================================================
/*!