diff options
| author | Brad King <brad.king@kitware.com> | 2015-01-26 15:28:25 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-01-26 15:28:25 (GMT) |
| commit | 8def82585c8fe81de8ee4c852f8065e19435532e (patch) | |
| tree | 0946a90ef04b8ed628c4ae0c2f7f038585d755e1 /Source | |
| parent | 7fefb97ed770e8ac32729cf50be52e5c913bd7b7 (diff) | |
| parent | d0adcccbf4321437f5ecb677c7f88b3e4af484ed (diff) | |
| download | CMake-8def82585c8fe81de8ee4c852f8065e19435532e.zip CMake-8def82585c8fe81de8ee4c852f8065e19435532e.tar.gz CMake-8def82585c8fe81de8ee4c852f8065e19435532e.tar.bz2 | |
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')
| -rw-r--r-- | Source/cmCoreTryCompile.cxx | 2 | ||||
| -rw-r--r-- | Source/cmTryRunCommand.cxx | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Source/cmCoreTryCompile.cxx b/Source/cmCoreTryCompile.cxx index 60d8dd9..5b5d6b6 100644 --- a/Source/cmCoreTryCompile.cxx +++ b/Source/cmCoreTryCompile.cxx @@ -109,7 +109,7 @@ int cmCoreTryCompile::TryCompileCode(std::vector<std::string> const& argv) } default: this->Makefile->IssueMessage(cmake::FATAL_ERROR, - "Only libraries may be used as try_compile IMPORTED " + "Only libraries may be used as try_compile or try_run IMPORTED " "LINK_LIBRARIES. Got " + std::string(tgt->GetName()) + " of " "type " + tgt->GetTargetTypeName(tgt->GetType()) + "."); return -1; diff --git a/Source/cmTryRunCommand.cxx b/Source/cmTryRunCommand.cxx index 3daf61e..b5280cf 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]; |