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

ENH: Added explicit declarations of some C functions that are hard to get from standard headers in como (www.comeaucomputing.com) strict mode.

Browse Source
This commit is contained in:
Brad King 2002-10-02 17:31:59 -04:00
parent cd8e26f14c
commit 5ce73bdd14
2 changed files with 15 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Source/cmGlobalUnixMakefileGenerator.cxx
View File

@ -40,19 +40,11 @@ void cmGlobalUnixMakefileGenerator::EnableLanguage(const char* lang,
static char envCC[5000]; static char envCC[5000];
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
} }
if (m_CMakeInstance->GetIsInTryCompile()) if (m_CMakeInstance->GetIsInTryCompile())
{ {
@ -80,7 +72,7 @@ void cmGlobalUnixMakefileGenerator::EnableLanguage(const char* lang,
if (!versionValue || atof(versionValue) <= 1.4) if (!versionValue || atof(versionValue) <= 1.4)
{ {
std::string fpath = root + "/Modules/CMakeBackwardCompatibilityC.cmake"; std::string fpath = root + "/Modules/CMakeBackwardCompatibilityC.cmake";
mf->ReadListFile(NULL,fpath.c_str()); mf->ReadListFile(0,fpath.c_str());
} }
} }
} }
@ -91,19 +83,11 @@ void cmGlobalUnixMakefileGenerator::EnableLanguage(const char* lang,
static char envCXX[5000]; static char envCXX[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
} }
std::string cmd = root; std::string cmd = root;
if (m_CMakeInstance->GetIsInTryCompile()) if (m_CMakeInstance->GetIsInTryCompile())
@ -131,7 +115,7 @@ void cmGlobalUnixMakefileGenerator::EnableLanguage(const char* lang,
if (!versionValue || atof(versionValue) <= 1.4) if (!versionValue || atof(versionValue) <= 1.4)
{ {
fpath = root + "/Modules/CMakeBackwardCompatibilityCXX.cmake"; fpath = root + "/Modules/CMakeBackwardCompatibilityCXX.cmake";
mf->ReadListFile(NULL,fpath.c_str()); mf->ReadListFile(0,fpath.c_str());
} }
} }
} }

17
Source/cmStandardIncludes.h
View File

@ -27,10 +27,6 @@
#include "cmConfigure.h" #include "cmConfigure.h"
#endif #endif
#if !defined(_WIN32) && defined(__COMO__)
# define _BSD_SOURCE
#endif
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning ( disable : 4786 ) #pragma warning ( disable : 4786 )
#pragma warning ( disable : 4503 ) #pragma warning ( disable : 4503 )
@ -70,6 +66,19 @@
// include the "c" string header // include the "c" string header
#include <string.h> #include <string.h>
#if !defined(_WIN32) && defined(__COMO__)
// Hack for como strict mode to avoid defining _SVID_SOURCE or _BSD_SOURCE.
extern "C"
{
extern FILE *popen (__const char *__command, __const char *__modes) __THROW;
extern int pclose (FILE *__stream) __THROW;
extern char *realpath (__const char *__restrict __name,
char *__restrict __resolved) __THROW;
extern char *strdup (__const char *__s) __THROW;
extern int putenv (char *__string) __THROW;
}
#endif
// if std:: is not supported, then just #define it away // if std:: is not supported, then just #define it away
#ifdef CMAKE_NO_STD_NAMESPACE #ifdef CMAKE_NO_STD_NAMESPACE
#define std #define std