|
@@ -92,11 +92,11 @@ bool cmAddLibraryCommand
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- /* ideally we should check whether for the linker language of the target
|
|
|
|
|
|
|
+ /* ideally we should check whether for the linker language of the target
|
|
|
CMAKE_${LANG}_CREATE_SHARED_LIBRARY is defined and if not default to
|
|
CMAKE_${LANG}_CREATE_SHARED_LIBRARY is defined and if not default to
|
|
|
- STATIC. But at this point we know only the name of the target, but not
|
|
|
|
|
|
|
+ STATIC. But at this point we know only the name of the target, but not
|
|
|
yet its linker language. */
|
|
yet its linker language. */
|
|
|
- if ((type != cmTarget::STATIC_LIBRARY) &&
|
|
|
|
|
|
|
+ if ((type != cmTarget::STATIC_LIBRARY) &&
|
|
|
(this->Makefile->GetCMakeInstance()->GetPropertyAsBool(
|
|
(this->Makefile->GetCMakeInstance()->GetPropertyAsBool(
|
|
|
"TARGET_SUPPORTS_SHARED_LIBS") == false))
|
|
"TARGET_SUPPORTS_SHARED_LIBS") == false))
|
|
|
{
|
|
{
|
|
@@ -172,9 +172,9 @@ bool cmAddLibraryCommand
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
std::vector<std::string> srclists;
|
|
std::vector<std::string> srclists;
|
|
|
- while (s != args.end())
|
|
|
|
|
|
|
+ while (s != args.end())
|
|
|
{
|
|
{
|
|
|
- srclists.push_back(*s);
|
|
|
|
|
|
|
+ srclists.push_back(*s);
|
|
|
++s;
|
|
++s;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -194,7 +194,7 @@ bool cmAddLibraryCommand
|
|
|
delete automoc;
|
|
delete automoc;
|
|
|
automoc = 0;
|
|
automoc = 0;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
return true;
|
|
return true;
|
|
|
}
|
|
}
|
|
|
|
|
|