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

Merge topic 'minor-cleanups' 

187385a cmCoreTryCompile: Fix typo in comments.
af2a3ab cmTarget: Remove unused variable.
620b0e9 target_link_libraries(): Fix code snippet in documentation.
2d4ce80 cmPolicies: Fix typo
d6dd264 include(): Use lower case and () to refer to the include() command.
This commit is contained in:
Brad King 2013-10-21 09:02:31 -04:00 committed by CMake Topic Stage
parent d06610888d 187385a8ed
commit 6d1444feac
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Help/command/target_link_libraries.rst
View File

@ -59,10 +59,11 @@ for <target>:
If an <item> is a library in a Mac OX framework, the Headers directory If an <item> is a library in a Mac OX framework, the Headers directory
of the framework will also be processed as a "usage requirement". of the framework will also be processed as a "usage requirement".
This has the same effect as passing the framework directory as an This has the same effect as passing the framework directory as an
include directory. target_link_libraries(<target> include directory.
:: ::
target_link_libraries(<target>
<PRIVATE|PUBLIC|INTERFACE> <lib> ... <PRIVATE|PUBLIC|INTERFACE> <lib> ...
[<PRIVATE|PUBLIC|INTERFACE> <lib> ... ] ...]) [<PRIVATE|PUBLIC|INTERFACE> <lib> ... ] ...])

2
Help/policy/CMP0017.rst
View File

@ -11,7 +11,7 @@ the modules belonging to CMake always get those files included which
they expect, and against which they were developed and tested. In all they expect, and against which they were developed and tested. In all
other cases, the files found in CMAKE_MODULE_PATH still take other cases, the files found in CMAKE_MODULE_PATH still take
precedence over the ones in the CMake module directory. The OLD precedence over the ones in the CMake module directory. The OLD
behaviour is to always prefer files from CMAKE_MODULE_PATH over files behavior is to always prefer files from CMAKE_MODULE_PATH over files
from the CMake modules directory. from the CMake modules directory.
This policy was introduced in CMake version 2.8.4. CMake version This policy was introduced in CMake version 2.8.4. CMake version

4
Source/cmCoreTryCompile.cxx
View File

@ -372,8 +372,8 @@ int cmCoreTryCompile::TryCompileCode(std::vector<std::string> const& argv)
} }
/* for the TRY_COMPILEs we want to be able to specify the architecture. /* for the TRY_COMPILEs we want to be able to specify the architecture.
So the user can set CMAKE_OSX_ARCHITECTURE to i386;ppc and then set So the user can set CMAKE_OSX_ARCHITECTURES to i386;ppc and then set
CMAKE_TRY_COMPILE_OSX_ARCHITECTURE first to i386 and then to ppc to CMAKE_TRY_COMPILE_OSX_ARCHITECTURES first to i386 and then to ppc to
have the tests run for each specific architecture. Since have the tests run for each specific architecture. Since
cmLocalGenerator doesn't allow building for "the other" cmLocalGenerator doesn't allow building for "the other"
architecture only via CMAKE_OSX_ARCHITECTURES. architecture only via CMAKE_OSX_ARCHITECTURES.

2
Source/cmIncludeCommand.cxx
View File

@ -19,7 +19,7 @@ bool cmIncludeCommand
if (args.size()< 1 || args.size() > 4) if (args.size()< 1 || args.size() > 4)
{ {
this->SetError("called with wrong number of arguments. " this->SetError("called with wrong number of arguments. "
"Include only takes one file."); "include() only takes one file.");
return false; return false;
} }
bool optional = false; bool optional = false;

1
Source/cmTarget.cxx
View File

@ -1990,7 +1990,6 @@ static void processIncludeDirectories(cmTarget *tgt,
{ {
case cmPolicies::WARN: case cmPolicies::WARN:
{ {
cmOStringStream w;
e << (mf->GetPolicies() e << (mf->GetPolicies()
->GetPolicyWarning(cmPolicies::CMP0021)) << "\n"; ->GetPolicyWarning(cmPolicies::CMP0021)) << "\n";
messageType = cmake::AUTHOR_WARNING; messageType = cmake::AUTHOR_WARNING;