kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Matt McCormick 2015-01-01 22:30:08 -05:00 committed by Brad King
parent 07cbe3640e
commit e2b1f0583f
5 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Help/command/try_run.rst
View File

@ -6,8 +6,9 @@ Try compiling and then running some code.
:: ::
try_run(RUN_RESULT_VAR COMPILE_RESULT_VAR try_run(RUN_RESULT_VAR COMPILE_RESULT_VAR
bindir srcfile [CMAKE_FLAGS <Flags>] bindir srcfile [CMAKE_FLAGS <flags>]
[COMPILE_DEFINITIONS <flags>] [COMPILE_DEFINITIONS <flags>]
[LINK_LIBRARIES <libs>]
[COMPILE_OUTPUT_VARIABLE comp] [COMPILE_OUTPUT_VARIABLE comp]
[RUN_OUTPUT_VARIABLE run] [RUN_OUTPUT_VARIABLE run]
[OUTPUT_VARIABLE var] [OUTPUT_VARIABLE var]
@ -22,6 +23,12 @@ where the output from the compile step goes. RUN_OUTPUT_VARIABLE
specifies the variable where the output from the running executable specifies the variable where the output from the running executable
goes. 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 For compatibility reasons OUTPUT_VARIABLE is still supported, which
gives you the output from the compile and run step combined. gives you the output from the compile and run step combined.

5
Help/release/dev/try-run-link-libraries.rst Normal file
View File

@ -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.

2
Source/cmCoreTryCompile.cxx
View File

@ -109,7 +109,7 @@ int cmCoreTryCompile::TryCompileCode(std::vector<std::string> const& argv)
} }
default: default:
this->Makefile->IssueMessage(cmake::FATAL_ERROR, 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 " "LINK_LIBRARIES. Got " + std::string(tgt->GetName()) + " of "
"type " + tgt->GetTargetTypeName(tgt->GetType()) + "."); "type " + tgt->GetTargetTypeName(tgt->GetType()) + ".");
return -1; return -1;

3
Source/cmTryRunCommand.cxx
View File

@ -48,7 +48,8 @@ bool cmTryRunCommand
{ {
++i; ++i;
while (i < argv.size() && argv[i] != "COMPILE_DEFINITIONS" && while (i < argv.size() && argv[i] != "COMPILE_DEFINITIONS" &&
argv[i] != "CMAKE_FLAGS") argv[i] != "CMAKE_FLAGS" &&
argv[i] != "LINK_LIBRARIES")
{ {
runArgs += " "; runArgs += " ";
runArgs += argv[i]; runArgs += argv[i];

4
Tests/RunCMake/try_compile/BadLinkLibraries-stderr.txt
View File

@ -1,5 +1,5 @@
CMake Error at BadLinkLibraries.cmake:2 \(try_compile\): CMake Error at BadLinkLibraries.cmake:2 \(try_compile\):
Only libraries may be used as try_compile IMPORTED LINK_LIBRARIES. Got Only libraries may be used as try_compile or try_run IMPORTED
not_a_library of type UTILITY. LINK_LIBRARIES. Got not_a_library of type UTILITY.
Call Stack \(most recent call first\): Call Stack \(most recent call first\):
CMakeLists.txt:3 \(include\) CMakeLists.txt:3 \(include\)