From 82ef90fcfccb1eaf53e4d15884ff3464aa9072a3 Mon Sep 17 00:00:00 2001 From: Brad King Date: Mon, 11 Apr 2016 10:39:04 -0400 Subject: cmCoreTryCompile: Factor out config lookup for re-use Store the lookup of CMAKE_TRY_COMPILE_CONFIGURATION in a local variable so we can re-use it. --- Source/cmCoreTryCompile.cxx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Source/cmCoreTryCompile.cxx b/Source/cmCoreTryCompile.cxx index b639c15..bf89dcb 100644 --- a/Source/cmCoreTryCompile.cxx +++ b/Source/cmCoreTryCompile.cxx @@ -294,6 +294,9 @@ int cmCoreTryCompile::TryCompileCode(std::vector const& argv, } } + std::string const tcConfig = + this->Makefile->GetSafeDefinition("CMAKE_TRY_COMPILE_CONFIGURATION"); + // we need to create a directory and CMakeLists file etc... // first create the directories sourceDirectory = this->BinaryDirectory.c_str(); @@ -406,8 +409,7 @@ int cmCoreTryCompile::TryCompileCode(std::vector const& argv, std::string fname = "/" + std::string(targetName) + "Targets.cmake"; cmExportTryCompileFileGenerator tcfg(gg, targets, this->Makefile); tcfg.SetExportFile((this->BinaryDirectory + fname).c_str()); - tcfg.SetConfig(this->Makefile->GetSafeDefinition( - "CMAKE_TRY_COMPILE_CONFIGURATION")); + tcfg.SetConfig(tcConfig); if(!tcfg.GenerateImportFile()) { -- cgit v0.12