summaryrefslogtreecommitdiff
path: root/Source/cmTryRunCommand.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-01-26 10:28:25 -0500
committerCMake Topic Stage <kwrobot@kitware.com>2015-01-26 10:28:25 -0500
commit8def82585c8fe81de8ee4c852f8065e19435532e (patch)
tree0946a90ef04b8ed628c4ae0c2f7f038585d755e1 /Source/cmTryRunCommand.cxx
parent7fefb97ed770e8ac32729cf50be52e5c913bd7b7 (diff)
parentd0adcccbf4321437f5ecb677c7f88b3e4af484ed (diff)
downloadcmake-8def82585c8fe81de8ee4c852f8065e19435532e.tar.gz
Merge topic 'try-run-link-libraries'
d0adcccb try_run: Add tests for LINK_LIBRARIES with mock libraries. 223c5cb7 try_run: Add test for bad link libraries. e2b1f058 try_run: Add support for LINK_LIBRARIES option.
Diffstat (limited to 'Source/cmTryRunCommand.cxx')
-rw-r--r--Source/cmTryRunCommand.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmTryRunCommand.cxx b/Source/cmTryRunCommand.cxx
index 3daf61e6a7..b5280cfd75 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];