diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2001-08-27 18:44:15 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2001-08-27 18:44:15 (GMT) |
| commit | f709e5588eaae694c7b1203580da0b5487b9ef73 (patch) | |
| tree | 92f04bc50327357323b50d736e67f94b83ca98fb /Source/cmUnixMakefileGenerator.cxx | |
| parent | 2858689d6dfe55e86b9fdb399f3d1f1f59c78b28 (diff) | |
| download | CMake-f709e5588eaae694c7b1203580da0b5487b9ef73.zip CMake-f709e5588eaae694c7b1203580da0b5487b9ef73.tar.gz CMake-f709e5588eaae694c7b1203580da0b5487b9ef73.tar.bz2 | |
ENH: change expand variables to use GetDefinition
Diffstat (limited to 'Source/cmUnixMakefileGenerator.cxx')
| -rw-r--r-- | Source/cmUnixMakefileGenerator.cxx | 46 |
1 files changed, 25 insertions, 21 deletions
diff --git a/Source/cmUnixMakefileGenerator.cxx b/Source/cmUnixMakefileGenerator.cxx index d5303fc..d93b803 100644 --- a/Source/cmUnixMakefileGenerator.cxx +++ b/Source/cmUnixMakefileGenerator.cxx @@ -1370,27 +1370,31 @@ void cmUnixMakefileGenerator::ComputeSystemInfo() { if (m_CacheOnly) { - if(m_Makefile->GetDefinition("CMAKE_CXX_COMPILER")) - { - std::string env = "CXX=${CMAKE_CXX_COMPILER}"; - m_Makefile->ExpandVariablesInString(env); - putenv(const_cast<char*>(env.c_str())); - env = "CC=${CMAKE_C_COMPILER}"; - m_Makefile->ExpandVariablesInString(env); - putenv(const_cast<char*>(env.c_str())); - } - - // currently we run configure shell script here to determine the info - std::string output; - std::string cmd = "cd "; - cmd += m_Makefile->GetHomeOutputDirectory(); - cmd += "; "; - const char* root - = m_Makefile->GetDefinition("CMAKE_ROOT"); - cmd += root; - cmd += "/Templates/configure"; - cmSystemTools::RunCommand(cmd.c_str(), output); - m_Makefile->AddDefinition("RUN_CONFIGURE", true); + if(m_Makefile->GetDefinition("CMAKE_CXX_COMPILER")) + { + std::string env = "CXX=${CMAKE_CXX_COMPILER}"; + m_Makefile->ExpandVariablesInString(env); + std::cout << "Setting: " << env.c_str() << "\n"; + putenv(const_cast<char*>(env.c_str())); + } + if(m_Makefile->GetDefinition("CMAKE_C_COMPILER")) + { + std::string env = "CC=${CMAKE_C_COMPILER}"; + m_Makefile->ExpandVariablesInString(env); + std::cout << "Setting: " << env.c_str() << "\n"; + putenv(const_cast<char*>(env.c_str())); + } + // currently we run configure shell script here to determine the info + std::string output; + std::string cmd = "cd "; + cmd += m_Makefile->GetHomeOutputDirectory(); + cmd += "; "; + const char* root + = m_Makefile->GetDefinition("CMAKE_ROOT"); + cmd += root; + cmd += "/Templates/configure"; + cmSystemTools::RunCommand(cmd.c_str(), output); + m_Makefile->AddDefinition("RUN_CONFIGURE", true); } // now load the settings |