[Cmake-commits] CMake branch, next, updated. v3.1.0-2304-g1c17514

[Matt McCormick]

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  1c175147e32341d5a9bf4c54fc8ea7cd9831c31c (commit)
       via  c33cbbd852f384883a56a027c6e7b96642559db0 (commit)
      from  b6aa7393f5501c658afc1c83001fcecec7a86e7a (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=1c175147e32341d5a9bf4c54fc8ea7cd9831c31c
commit 1c175147e32341d5a9bf4c54fc8ea7cd9831c31c
Merge: b6aa739 c33cbbd
Author:     Matt McCormick <matt.mccormick at kitware.com>
AuthorDate: Wed Jan 21 22:50:29 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 21 22:50:29 2015 -0500

    Merge topic 'try-run-link-libraries' into next
    
    c33cbbd8 try_run: Add support for LINK_LIBRARIES option.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c33cbbd852f384883a56a027c6e7b96642559db0
commit c33cbbd852f384883a56a027c6e7b96642559db0
Author:     Matt McCormick <matt.mccormick at kitware.com>
AuthorDate: Thu Jan 1 22:30:08 2015 -0500
Commit:     Matt McCormick <matt.mccormick at kitware.com>
CommitDate: Mon Jan 5 12:41:56 2015 -0500

    try_run: Add support for LINK_LIBRARIES option.
    
    Most functionality is already implemented in Source/cmCoreTryCompile.{h,cxx}.
    Document and improve argument parsing.
    
    This functionality is already being used by a number of modules, like
    CheckCSourceCompiles.cmake, but it is not documented.

diff --git a/Help/command/try_run.rst b/Help/command/try_run.rst
index 9a17ad9..66245f6 100644
--- a/Help/command/try_run.rst
+++ b/Help/command/try_run.rst
@@ -6,8 +6,9 @@ Try compiling and then running some code.
 ::
 
   try_run(RUN_RESULT_VAR COMPILE_RESULT_VAR
-          bindir srcfile [CMAKE_FLAGS <Flags>]
+          bindir srcfile [CMAKE_FLAGS <flags>]
           [COMPILE_DEFINITIONS <flags>]
+          [LINK_LIBRARIES <libs>]
           [COMPILE_OUTPUT_VARIABLE comp]
           [RUN_OUTPUT_VARIABLE run]
           [OUTPUT_VARIABLE var]
diff --git a/Source/cmTryRunCommand.cxx b/Source/cmTryRunCommand.cxx
index 8f2deeb..8bd33d0 100644
--- a/Source/cmTryRunCommand.cxx
+++ b/Source/cmTryRunCommand.cxx
@@ -48,7 +48,8 @@ bool cmTryRunCommand
       {
       ++i;
       while (i < argv.size() && argv[i] != "COMPILE_DEFINITIONS" &&
-             argv[i] != "CMAKE_FLAGS")
+             argv[i] != "CMAKE_FLAGS" &&
+             argv[i] != "LINK_LIBRARIES")
         {
         runArgs += " ";
         runArgs += argv[i];

-----------------------------------------------------------------------

Summary of changes:
 Help/command/try_run.rst   |    3 ++-
 Source/cmTryRunCommand.cxx |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake