[Cmake-commits] [cmake-commits] hoffman committed cmComputeLinkInformation.cxx 1.33 1.34
cmake-commits at cmake.org
cmake-commits at cmake.org
Fri Apr 18 17:32:18 EDT 2008
Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv9701
Modified Files:
cmComputeLinkInformation.cxx
Log Message:
ENH: only complain about -l stuff for CMP0003
Index: cmComputeLinkInformation.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmComputeLinkInformation.cxx,v
retrieving revision 1.33
retrieving revision 1.34
diff -C 2 -d -r1.33 -r1.34
*** cmComputeLinkInformation.cxx 8 Apr 2008 04:06:46 -0000 1.33
--- cmComputeLinkInformation.cxx 18 Apr 2008 21:32:15 -0000 1.34
***************
*** 1188,1192 ****
else if(item[0] == '-' || item[0] == '$' || item[0] == '`')
{
! if(item.find("-framework") != 0)
{
// This is a linker option provided by the user.
--- 1188,1196 ----
else if(item[0] == '-' || item[0] == '$' || item[0] == '`')
{
! // if this is a -l option then we might need to warn about
! // CMP0003 so put it in OldUserFlagItems, if it is not a -l
! // or -Wl,-l (-framework -pthread), then allow it without a
! // CMP0003 as -L will not affect those other linker flags
! if(item.find("-l") == 0 || item.find("-Wl,-l") == 0)
{
// This is a linker option provided by the user.
More information about the Cmake-commits
mailing list