kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

QtAutogen: Fix autouic target options in the presence of a config. 

Read the correct variable.  Add scopes to prevent escape of variables.
This commit is contained in:
Stephen Kelly 2014-01-24 13:19:36 +01:00
parent 964d7f2ae9
commit 394e86df2a
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/cmQtAutoGenerators.cxx
View File

@ -1035,6 +1035,7 @@ bool cmQtAutoGenerators::ReadAutogenInfoFile(cmMakefile* makefile,
this->MocExecutable = makefile->GetSafeDefinition("AM_QT_MOC_EXECUTABLE"); this->MocExecutable = makefile->GetSafeDefinition("AM_QT_MOC_EXECUTABLE");
this->UicExecutable = makefile->GetSafeDefinition("AM_QT_UIC_EXECUTABLE"); this->UicExecutable = makefile->GetSafeDefinition("AM_QT_UIC_EXECUTABLE");
this->RccExecutable = makefile->GetSafeDefinition("AM_QT_RCC_EXECUTABLE"); this->RccExecutable = makefile->GetSafeDefinition("AM_QT_RCC_EXECUTABLE");
{
std::string compileDefsPropOrig = "AM_MOC_COMPILE_DEFINITIONS"; std::string compileDefsPropOrig = "AM_MOC_COMPILE_DEFINITIONS";
std::string compileDefsProp = compileDefsPropOrig; std::string compileDefsProp = compileDefsPropOrig;
if(config) if(config)
@ -1045,6 +1046,8 @@ bool cmQtAutoGenerators::ReadAutogenInfoFile(cmMakefile* makefile,
const char *compileDefs = makefile->GetDefinition(compileDefsProp.c_str()); const char *compileDefs = makefile->GetDefinition(compileDefsProp.c_str());
this->MocCompileDefinitionsStr = compileDefs ? compileDefs this->MocCompileDefinitionsStr = compileDefs ? compileDefs
: makefile->GetSafeDefinition(compileDefsPropOrig.c_str()); : makefile->GetSafeDefinition(compileDefsPropOrig.c_str());
}
{
std::string includesPropOrig = "AM_MOC_INCLUDES"; std::string includesPropOrig = "AM_MOC_INCLUDES";
std::string includesProp = includesPropOrig; std::string includesProp = includesPropOrig;
if(config) if(config)
@ -1055,6 +1058,7 @@ bool cmQtAutoGenerators::ReadAutogenInfoFile(cmMakefile* makefile,
const char *includes = makefile->GetDefinition(includesProp.c_str()); const char *includes = makefile->GetDefinition(includesProp.c_str());
this->MocIncludesStr = includes ? includes this->MocIncludesStr = includes ? includes
: makefile->GetSafeDefinition(includesPropOrig.c_str()); : makefile->GetSafeDefinition(includesPropOrig.c_str());
}
this->MocOptionsStr = makefile->GetSafeDefinition("AM_MOC_OPTIONS"); this->MocOptionsStr = makefile->GetSafeDefinition("AM_MOC_OPTIONS");
this->ProjectBinaryDir = makefile->GetSafeDefinition("AM_CMAKE_BINARY_DIR"); this->ProjectBinaryDir = makefile->GetSafeDefinition("AM_CMAKE_BINARY_DIR");
this->ProjectSourceDir = makefile->GetSafeDefinition("AM_CMAKE_SOURCE_DIR"); this->ProjectSourceDir = makefile->GetSafeDefinition("AM_CMAKE_SOURCE_DIR");
@ -1074,7 +1078,7 @@ bool cmQtAutoGenerators::ReadAutogenInfoFile(cmMakefile* makefile,
= makefile->GetSafeDefinition(uicOptionsProp.c_str()); = makefile->GetSafeDefinition(uicOptionsProp.c_str());
cmSystemTools::ExpandListArgument( cmSystemTools::ExpandListArgument(
uicTargetOptions ? uicTargetOptions uicTargetOptions ? uicTargetOptions
: makefile->GetSafeDefinition(includesPropOrig.c_str()), : makefile->GetSafeDefinition(uicOptionsPropOrig.c_str()),
this->UicTargetOptions); this->UicTargetOptions);
const char *uicOptionsOptions const char *uicOptionsOptions
= makefile->GetSafeDefinition("AM_UIC_OPTIONS_OPTIONS"); = makefile->GetSafeDefinition("AM_UIC_OPTIONS_OPTIONS");