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

-fix #13081: support OBJECT libraries in CodeBlocks/QtCreator projects 

Alex
This commit is contained in:
Alex Neundorf 2012-03-31 16:01:37 +02:00
parent 41d1a73e5b
commit d2ed3c7dee
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Source/cmExtraCodeBlocksGenerator.cxx
View File

@ -383,6 +383,7 @@ void cmExtraCodeBlocksGenerator
case cmTarget::STATIC_LIBRARY: case cmTarget::STATIC_LIBRARY:
case cmTarget::SHARED_LIBRARY: case cmTarget::SHARED_LIBRARY:
case cmTarget::MODULE_LIBRARY: case cmTarget::MODULE_LIBRARY:
case cmTarget::OBJECT_LIBRARY:
{ {
this->AppendTarget(fout, ti->first.c_str(), &ti->second, this->AppendTarget(fout, ti->first.c_str(), &ti->second,
make.c_str(), makefile, compiler.c_str()); make.c_str(), makefile, compiler.c_str());
@ -420,6 +421,7 @@ void cmExtraCodeBlocksGenerator
case cmTarget::STATIC_LIBRARY: case cmTarget::STATIC_LIBRARY:
case cmTarget::SHARED_LIBRARY: case cmTarget::SHARED_LIBRARY:
case cmTarget::MODULE_LIBRARY: case cmTarget::MODULE_LIBRARY:
case cmTarget::OBJECT_LIBRARY:
case cmTarget::UTILITY: // can have sources since 2.6.3 case cmTarget::UTILITY: // can have sources since 2.6.3
{ {
const std::vector<cmSourceFile*>&sources=ti->second.GetSourceFiles(); const std::vector<cmSourceFile*>&sources=ti->second.GetSourceFiles();
@ -570,7 +572,17 @@ void cmExtraCodeBlocksGenerator::AppendTarget(cmGeneratedFileStream& fout,
} }
const char* buildType = makefile->GetDefinition("CMAKE_BUILD_TYPE"); const char* buildType = makefile->GetDefinition("CMAKE_BUILD_TYPE");
fout<<" <Option output=\"" << target->GetLocation(buildType) const char* location = 0;
if ( target->GetType()==cmTarget::OBJECT_LIBRARY)
{
location = "dummy"; // hmm, what to use here ?
}
else
{
location = target->GetLocation(buildType);
}
fout<<" <Option output=\"" << location
<< "\" prefix_auto=\"0\" extension_auto=\"0\" />\n" << "\" prefix_auto=\"0\" extension_auto=\"0\" />\n"
" <Option working_dir=\"" << workingDir << "\" />\n" " <Option working_dir=\"" << workingDir << "\" />\n"
" <Option object_output=\"./\" />\n" " <Option object_output=\"./\" />\n"
@ -728,7 +740,8 @@ int cmExtraCodeBlocksGenerator::GetCBTargetType(cmTarget* target)
return 1; return 1;
} }
} }
else if ( target->GetType()==cmTarget::STATIC_LIBRARY) else if (( target->GetType()==cmTarget::STATIC_LIBRARY)
|| (target->GetType()==cmTarget::OBJECT_LIBRARY))
{ {
return 2; return 2;
} }