[cmake-developers] [Cmake-commits] CMake branch, next, updated. v2.8.2-557-gd77639f

[Bill Hoffman]

Does this need a policy?   ie. does it print a warning or is in an
error?  If an error, it might break some existing builds that used to
work before this change.  Also, a test might be nice. :)

On Thu, Aug 26, 2010 at 3:06 PM, Alexander Neundorf <neundorf at kde.org> wrote:
> This is an automated email from the git hooks/post-receive script. It was
> generated because a ref change was pushed to the repository containing
> the project "CMake".
>
> The branch, next has been updated
>       via  d77639f694fab0ca53a1f640c9dd3e22fb984887 (commit)
>       via  c7866351494885cee1d1d5747ec2bc03fe845f6f (commit)
>       via  43f96eaf93541b6e820ca1ebc15802aaa38427e2 (commit)
>       via  737261785a85f365c28ce4fb3da7695f8c09e139 (commit)
>      from  7efde759c9921b3ed90a5e2578c7d00fe5ecd9f9 (commit)
>
> Those revisions listed above that are new to this repository have
> not appeared on any other notification email; so we list those
> revisions in full, below.
>
> - Log -----------------------------------------------------------------
> http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d77639f694fab0ca53a1f640c9dd3e22fb984887
> commit d77639f694fab0ca53a1f640c9dd3e22fb984887
> Merge: 7efde75 c786635
> Author:     Alex Neundorf <neundorf at kde.org>
> AuthorDate: Thu Aug 26 21:04:56 2010 +0200
> Commit:     Alex Neundorf <neundorf at kde.org>
> CommitDate: Thu Aug 26 21:04:56 2010 +0200
>
>    Merge branch 'MakeTargetLinkLibrariesComplainWhenNoTargetIsUsed' into next
>
>
> http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c7866351494885cee1d1d5747ec2bc03fe845f6f
> commit c7866351494885cee1d1d5747ec2bc03fe845f6f
> Author:     Alex Neundorf <neundorf at kde.org>
> AuthorDate: Thu Aug 26 21:02:40 2010 +0200
> Commit:     Alex Neundorf <neundorf at kde.org>
> CommitDate: Thu Aug 26 21:02:40 2010 +0200
>
>    Make target_link_libraries() complain if bad target name is used
>
>    target_link_libraries() did not complain if there was only one argument,
>    and this one (first) argument wasn't a valid target name, e.g.
>
>    add_executable(hello main.cpp)
>    target_link_libraries(-static-intel)
>
>    Here the target "hello" was forgotten in the tll() call, but cmake didn't
>    complain. With this commit it does.
>
>    Alex
>
> diff --git a/Source/cmTargetLinkLibrariesCommand.cxx b/Source/cmTargetLinkLibrariesCommand.cxx
> index d994260..390e39b 100644
> --- a/Source/cmTargetLinkLibrariesCommand.cxx
> +++ b/Source/cmTargetLinkLibrariesCommand.cxx
> @@ -29,12 +29,6 @@ bool cmTargetLinkLibrariesCommand
>     return false;
>     }
>
> -  // but we might not have any libs after variable expansion
> -  if(args.size() < 2)
> -    {
> -    return true;
> -    }
> -
>   // Lookup the target for which libraries are specified.
>   this->Target =
>     this->Makefile->GetCMakeInstance()
> @@ -49,6 +43,12 @@ bool cmTargetLinkLibrariesCommand
>     return true;
>     }
>
> +  // but we might not have any libs after variable expansion
> +  if(args.size() < 2)
> +    {
> +    return true;
> +    }
> +
>   // Keep track of link configuration specifiers.
>   cmTarget::LinkLibraryType llt = cmTarget::GENERAL;
>   bool haveLLT = false;
>
> http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=43f96eaf93541b6e820ca1ebc15802aaa38427e2
> commit 43f96eaf93541b6e820ca1ebc15802aaa38427e2
> Author:     Alex Neundorf <neundorf at kde.org>
> AuthorDate: Thu Aug 26 21:01:58 2010 +0200
> Commit:     Alex Neundorf <neundorf at kde.org>
> CommitDate: Thu Aug 26 21:01:58 2010 +0200
>
>    Remove trailing whitespace
>
>    Alex
>
> diff --git a/Source/cmTargetLinkLibrariesCommand.cxx b/Source/cmTargetLinkLibrariesCommand.cxx
> index f1f76c8..d994260 100644
> --- a/Source/cmTargetLinkLibrariesCommand.cxx
> +++ b/Source/cmTargetLinkLibrariesCommand.cxx
> @@ -57,7 +57,7 @@ bool cmTargetLinkLibrariesCommand
>   // specification when the keyword is encountered.
>   this->DoingInterface = false;
>
> -  // add libraries, nothe that there is an optional prefix
> +  // add libraries, nothe that there is an optional prefix
>   // of debug and optimized than can be used
>   for(unsigned int i=1; i < args.size(); ++i)
>     {
> @@ -118,7 +118,7 @@ bool cmTargetLinkLibrariesCommand
>       llt = cmTarget::GENERAL;
>       std::string linkType = args[0];
>       linkType += "_LINK_TYPE";
> -      const char* linkTypeString =
> +      const char* linkTypeString =
>         this->Makefile->GetDefinition( linkType.c_str() );
>       if(linkTypeString)
>         {
> @@ -133,7 +133,7 @@ bool cmTargetLinkLibrariesCommand
>         }
>       this->HandleLibrary(args[i].c_str(), llt);
>       }
> -    }
> +    }
>
>   // Make sure the last argument was not a library type specifier.
>   if(haveLLT)
>
> -----------------------------------------------------------------------
>
> Summary of changes:
>  Source/cmTargetLinkLibrariesCommand.cxx |   18 +++++++++---------
>  Source/kwsys/kwsysDateStamp.cmake       |    2 +-
>  2 files changed, 10 insertions(+), 10 deletions(-)
>
>
> hooks/post-receive
> --
> CMake
> _______________________________________________
> Cmake-commits mailing list
> Cmake-commits at cmake.org
> http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
>