summaryrefslogtreecommitdiffstats
path: root/Source/cmAddLibraryCommand.cxx
diff options
context:
space:
mode:
authorYves Starreveld <ystarrev@uwo.ca>2001-08-28 22:02:59 (GMT)
committerYves Starreveld <ystarrev@uwo.ca>2001-08-28 22:02:59 (GMT)
commit247c1640dabcf73f0d904379040d70c270ecddf6 (patch)
tree5383292cdd0841327c7cf7ef10cc9050ccb024fa /Source/cmAddLibraryCommand.cxx
parent0b58132cd4ece384c8436da0a909bbe5d728038e (diff)
downloadCMake-247c1640dabcf73f0d904379040d70c270ecddf6.zip
CMake-247c1640dabcf73f0d904379040d70c270ecddf6.tar.gz
CMake-247c1640dabcf73f0d904379040d70c270ecddf6.tar.bz2
Changes to allow MODULE type target for a shared library
Diffstat (limited to 'Source/cmAddLibraryCommand.cxx')
-rw-r--r--Source/cmAddLibraryCommand.cxx11
1 files changed, 8 insertions, 3 deletions
diff --git a/Source/cmAddLibraryCommand.cxx b/Source/cmAddLibraryCommand.cxx
index f607df3..f75e909 100644
--- a/Source/cmAddLibraryCommand.cxx
+++ b/Source/cmAddLibraryCommand.cxx
@@ -52,7 +52,7 @@ bool cmAddLibraryCommand::InitialPass(std::vector<std::string>& args)
// Library type defaults to value of BUILD_SHARED_LIBS, if it exists,
// otherwise it defaults to static library.
- bool shared = !cmSystemTools::IsOff(m_Makefile->GetDefinition("BUILD_SHARED_LIBS"));
+ int shared = !cmSystemTools::IsOff(m_Makefile->GetDefinition("BUILD_SHARED_LIBS"));
std::vector<std::string>::iterator s = args.begin();
++s;
@@ -67,12 +67,17 @@ bool cmAddLibraryCommand::InitialPass(std::vector<std::string>& args)
if(libType == "STATIC")
{
++s;
- shared = false;
+ shared = 0;
}
else if(libType == "SHARED")
{
++s;
- shared = true;
+ shared = 1;
+ }
+ else if(libType == "MODULE")
+ {
+ ++s;
+ shared = 2;
}
}
std::vector<std::string> srclists(s, args.end());