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

ERR: Fixes for comeau compiler. NULL is a pointer of type void*, and cannot be compared directly with other pointer types. We use 0 instead. Also changed putenv to setenv for comeau on linux.

Browse Source
This commit is contained in:
Brad King 2002-09-10 15:40:41 -04:00
parent 14f0211858
commit de48dbbf7c
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Source/cmGlobalUnixMakefileGenerator.cxx
View File

@ -14,6 +14,7 @@
PURPOSE. See the above copyright notices for more information. PURPOSE. See the above copyright notices for more information.
=========================================================================*/ =========================================================================*/
#include "cmGlobalUnixMakefileGenerator.h" #include "cmGlobalUnixMakefileGenerator.h"
#include "cmLocalUnixMakefileGenerator.h" #include "cmLocalUnixMakefileGenerator.h"
#include "cmMakefile.h" #include "cmMakefile.h"
@ -34,19 +35,35 @@ void cmGlobalUnixMakefileGenerator::EnableLanguage(const char* lang,
static char envCC[5000]; static char envCC[5000];
if(mf->GetDefinition("CMAKE_CXX_COMPILER")) if(mf->GetDefinition("CMAKE_CXX_COMPILER"))
{ {
#if !defined(_WIN32) && defined(__COMO__)
std::string env = "${CMAKE_CXX_COMPILER}";
mf->ExpandVariablesInString(env);
strncpy(envCXX, env.c_str(), 4999);
envCXX[4999] = 0;
setenv("CXX", envCXX, 1);
#else
std::string env = "CXX=${CMAKE_CXX_COMPILER}"; std::string env = "CXX=${CMAKE_CXX_COMPILER}";
mf->ExpandVariablesInString(env); mf->ExpandVariablesInString(env);
strncpy(envCXX, env.c_str(), 4999); strncpy(envCXX, env.c_str(), 4999);
envCXX[4999] = 0; envCXX[4999] = 0;
putenv(envCXX); putenv(envCXX);
#endif
} }
if(mf->GetDefinition("CMAKE_C_COMPILER")) if(mf->GetDefinition("CMAKE_C_COMPILER"))
{ {
#if !defined(_WIN32) && defined(__COMO__)
std::string env = "${CMAKE_C_COMPILER}";
mf->ExpandVariablesInString(env);
strncpy(envCC, env.c_str(), 4999);
envCC[4999] = 0;
setenv("CC", envCC, 1);
#else
std::string env = "CC=${CMAKE_C_COMPILER}"; std::string env = "CC=${CMAKE_C_COMPILER}";
mf->ExpandVariablesInString(env); mf->ExpandVariablesInString(env);
strncpy(envCC, env.c_str(), 4999); strncpy(envCC, env.c_str(), 4999);
envCC[4999] = 0; envCC[4999] = 0;
putenv(envCC); putenv(envCC);
#endif
} }
std::string output; std::string output;
std::string root std::string root
@ -65,7 +82,7 @@ void cmGlobalUnixMakefileGenerator::EnableLanguage(const char* lang,
cmSystemTools::ConvertToOutputPath(mf->GetHomeOutputDirectory()).c_str()); cmSystemTools::ConvertToOutputPath(mf->GetHomeOutputDirectory()).c_str());
std::string fpath = mf->GetHomeOutputDirectory(); std::string fpath = mf->GetHomeOutputDirectory();
fpath += "/CCMakeSystemConfig.cmake"; fpath += "/CCMakeSystemConfig.cmake";
mf->ReadListFile(NULL,fpath.c_str()); mf->ReadListFile(0,fpath.c_str());
this->SetLanguageEnabled("C"); this->SetLanguageEnabled("C");
} }
// if CXX // if CXX
@ -77,7 +94,7 @@ void cmGlobalUnixMakefileGenerator::EnableLanguage(const char* lang,
cmSystemTools::ConvertToOutputPath(mf->GetHomeOutputDirectory()).c_str()); cmSystemTools::ConvertToOutputPath(mf->GetHomeOutputDirectory()).c_str());
std::string fpath = mf->GetHomeOutputDirectory(); std::string fpath = mf->GetHomeOutputDirectory();
fpath += "/CXXCMakeSystemConfig.cmake"; fpath += "/CXXCMakeSystemConfig.cmake";
mf->ReadListFile(NULL,fpath.c_str()); mf->ReadListFile(0,fpath.c_str());
this->SetLanguageEnabled("CXX"); this->SetLanguageEnabled("CXX");
} }
} }