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 400b6ceff2137ab69b2f3cc6345cdf3e043e5a53 (commit)
via a7d6ebb01ba7418af3af74a532900f0d7cb210fe (commit)
from 23c544089e608879ee3138f1399e1c325ac43019 (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=400b6ceff2137ab69b2f3cc6345cdf3e043e5a53
commit 400b6ceff2137ab69b2f3cc6345cdf3e043e5a53
Merge: 23c5440 a7d6ebb
Author: Alexander Neundorf <neund...@kde.org>
AuthorDate: Sun Jan 27 13:17:20 2013 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Sun Jan 27 13:17:20 2013 -0500
Merge topic 'DocumentRelativePathHandling' into next
a7d6ebb documentation: handling of relative paths by include- and
link_directories()
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a7d6ebb01ba7418af3af74a532900f0d7cb210fe
commit a7d6ebb01ba7418af3af74a532900f0d7cb210fe
Author: Alex Neundorf <neund...@kde.org>
AuthorDate: Sun Jan 27 18:00:14 2013 +0100
Commit: Alex Neundorf <neund...@kde.org>
CommitDate: Sun Jan 27 18:00:14 2013 +0100
documentation: handling of relative paths by include- and link_directories()
Alex
diff --git a/Source/cmIncludeDirectoryCommand.h
b/Source/cmIncludeDirectoryCommand.h
index a32fc77..77a340a 100644
--- a/Source/cmIncludeDirectoryCommand.h
+++ b/Source/cmIncludeDirectoryCommand.h
@@ -59,8 +59,9 @@ public:
return
" include_directories([AFTER|BEFORE] [SYSTEM] dir1 dir2 ...)\n"
"Add the given directories to those the compiler uses to search "
- "for include files. "
- "These directories are added to the directory property "
+ "for include files. Relative paths are interpreted as relative to "
+ "the current source directory. \n"
+ "The include directories are added to the directory property "
"INCLUDE_DIRECTORIES for the current CMakeLists file. "
"They are also added to the target property INCLUDE_DIRECTORIES "
"for each target in the current CMakeLists file. "
diff --git a/Source/cmLinkDirectoriesCommand.h
b/Source/cmLinkDirectoriesCommand.h
index 889118c..9218f44 100644
--- a/Source/cmLinkDirectoriesCommand.h
+++ b/Source/cmLinkDirectoriesCommand.h
@@ -62,10 +62,8 @@ public:
" link_directories(directory1 directory2 ...)\n"
"Specify the paths in which the linker should search for libraries. "
"The command will apply only to targets created after it is called. "
- "For historical reasons, relative paths given to this command are "
- "passed to the linker unchanged "
- "(unlike many CMake commands which interpret them relative to the "
- "current source directory).\n"
+ "Relative paths given to this command are interpreted as relative to "
+ "the current source directory, see CMP0015. \n"
"Note that this command is rarely necessary. Library locations "
"returned by find_package() and find_library() are absolute paths. "
"Pass these absolute library file paths directly to the "
-----------------------------------------------------------------------
Summary of changes:
Source/cmIncludeDirectoryCommand.h | 5 +++--
Source/cmLinkDirectoriesCommand.h | 6 ++----
2 files changed, 5 insertions(+), 6 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
