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

Add check so that java projects build without C++

This commit is contained in:
Andy Cedilnik 2002-12-11 12:09:52 -05:00
parent d6f98c2a82
commit 682e2c7b8b
3 changed files with 84 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/cmGlobalVisualStudio7Generator.cxx
View File

@ -153,8 +153,12 @@ void cmGlobalVisualStudio7Generator::SetupTests()
void cmGlobalVisualStudio7Generator::GenerateConfigurations()
{
// process the configurations
std::string configTypes =
m_CMakeInstance->GetCacheDefinition("CMAKE_CONFIGURATION_TYPES");
const char* ct
= m_CMakeInstance->GetCacheDefinition("CMAKE_CONFIGURATION_TYPES");
if ( ct )
{
std::string configTypes = ct;
std::string::size_type start = 0;
std::string::size_type endpos = 0;
while(endpos != std::string::npos)
@ -190,6 +194,7 @@ void cmGlobalVisualStudio7Generator::GenerateConfigurations()
}
start = endpos+1;
}
}
if(m_Configurations.size() == 0)
{
m_Configurations.push_back("Debug");

5
Source/cmLocalVisualStudio6Generator.cxx
View File

@ -816,6 +816,9 @@ void cmLocalVisualStudio6Generator::WriteDSPHeader(std::ostream& fout, const cha
cmSystemTools::ReplaceString(line,
"EXTRA_DEFINES",
m_Makefile->GetDefineFlags());
cmGlobalGenerator* gen = this->GetGlobalGenerator();
if ( gen->GetLanguageEnabled("C") ||gen->GetLanguageEnabled("CXX") )
{
std::string flags = m_Makefile->GetDefinition("CMAKE_CXX_FLAGS_RELEASE");
flags += " -DCMAKE_INTDIR=\\\"Release\\\"";
cmSystemTools::ReplaceString(line, "CMAKE_CXX_FLAGS_RELEASE", flags.c_str());
@ -831,7 +834,7 @@ void cmLocalVisualStudio6Generator::WriteDSPHeader(std::ostream& fout, const cha
cmSystemTools::ReplaceString(line, "CMAKE_CXX_FLAGS",
m_Makefile->
GetDefinition("CMAKE_CXX_FLAGS"));
}
fout << line.c_str() << std::endl;
}
}

3
Source/cmLocalVisualStudio7Generator.cxx
View File

@ -329,7 +329,10 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
}
fout << "\t\t\t\tAssemblerListingLocation=\"" << configName << "\"\n";
fout << "\t\t\t\tObjectFile=\"" << configName << "\\\"\n";
if ( m_Makefile->GetDefinition("CMAKE_CXX_WARNING_LEVEL") )
{
fout << "\t\t\t\tWarningLevel=\"" << m_Makefile->GetDefinition("CMAKE_CXX_WARNING_LEVEL") << "\"\n";
}
fout << "\t\t\t\tDetect64BitPortabilityProblems=\"TRUE\"\n"
<< "\t\t\t\tDebugInformationFormat=\"3\"";
fout << "/>\n"; // end of <Tool Name=VCCLCompilerTool