[Cmake-commits] CMake branch, next, updated. v3.1.1-2325-g5dce3cf
Brad King
brad.king at kitware.com
Mon Jan 26 10:03:51 EST 2015
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 5dce3cf7343b50d95a87f68ed9ffadd936d74c53 (commit)
via d7f4b5673d4f68a3de0fa5d0dc71322dd575e443 (commit)
via 8b0b49061310e2d14c34fe60d41b1082eaa72e77 (commit)
from 04344c3f69d61444dca18bc3c4ca6c07c7197fd7 (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=5dce3cf7343b50d95a87f68ed9ffadd936d74c53
commit 5dce3cf7343b50d95a87f68ed9ffadd936d74c53
Merge: 04344c3 d7f4b56
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 26 10:03:50 2015 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 26 10:03:50 2015 -0500
Merge topic 'try-run-link-libraries' into next
d7f4b567 Help: Document try_run LINK_LIBRARIES option
8b0b4906 Help: Add notes for topic 'try-run-link-libraries'
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d7f4b5673d4f68a3de0fa5d0dc71322dd575e443
commit d7f4b5673d4f68a3de0fa5d0dc71322dd575e443
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 26 10:03:12 2015 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Jan 26 10:03:12 2015 -0500
Help: Document try_run LINK_LIBRARIES option
diff --git a/Help/command/try_run.rst b/Help/command/try_run.rst
index 66245f6..b8ea0fe 100644
--- a/Help/command/try_run.rst
+++ b/Help/command/try_run.rst
@@ -23,6 +23,12 @@ where the output from the compile step goes. RUN_OUTPUT_VARIABLE
specifies the variable where the output from the running executable
goes.
+The srcfile signature also accepts a LINK_LIBRARIES argument which may
+contain a list of libraries or IMPORTED targets which will be linked
+to in the generated project. If LINK_LIBRARIES is specified as a
+parameter to try_run, then any LINK_LIBRARIES passed as
+CMAKE_FLAGS will be ignored.
+
For compatibility reasons OUTPUT_VARIABLE is still supported, which
gives you the output from the compile and run step combined.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8b0b49061310e2d14c34fe60d41b1082eaa72e77
commit 8b0b49061310e2d14c34fe60d41b1082eaa72e77
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 26 09:57:55 2015 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Jan 26 09:57:55 2015 -0500
Help: Add notes for topic 'try-run-link-libraries'
diff --git a/Help/release/dev/try-run-link-libraries.rst b/Help/release/dev/try-run-link-libraries.rst
new file mode 100644
index 0000000..4f20cbd
--- /dev/null
+++ b/Help/release/dev/try-run-link-libraries.rst
@@ -0,0 +1,5 @@
+try-run-link-libraries
+----------------------
+
+* The :command:`try_run` command learned to honor the ``LINK_LIBRARIES``
+ option just as :command:`try_compile` already does.
-----------------------------------------------------------------------
Summary of changes:
Help/command/try_run.rst | 6 ++++++
Help/release/dev/try-run-link-libraries.rst | 5 +++++
2 files changed, 11 insertions(+)
create mode 100644 Help/release/dev/try-run-link-libraries.rst
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list