Merge topic 'DocumentRelativePathHandling'

a7d6ebb documentation: handling of relative paths by include- and link_directories()
This commit is contained in:
Brad King 2013-01-29 14:52:22 -05:00 committed by CMake Topic Stage
commit 32b9e67057
2 changed files with 5 additions and 6 deletions

View File

@ -59,8 +59,9 @@ public:
return return
" include_directories([AFTER|BEFORE] [SYSTEM] dir1 dir2 ...)\n" " include_directories([AFTER|BEFORE] [SYSTEM] dir1 dir2 ...)\n"
"Add the given directories to those the compiler uses to search " "Add the given directories to those the compiler uses to search "
"for include files. " "for include files. Relative paths are interpreted as relative to "
"These directories are added to the directory property " "the current source directory. \n"
"The include directories are added to the directory property "
"INCLUDE_DIRECTORIES for the current CMakeLists file. " "INCLUDE_DIRECTORIES for the current CMakeLists file. "
"They are also added to the target property INCLUDE_DIRECTORIES " "They are also added to the target property INCLUDE_DIRECTORIES "
"for each target in the current CMakeLists file. " "for each target in the current CMakeLists file. "

View File

@ -62,10 +62,8 @@ public:
" link_directories(directory1 directory2 ...)\n" " link_directories(directory1 directory2 ...)\n"
"Specify the paths in which the linker should search for libraries. " "Specify the paths in which the linker should search for libraries. "
"The command will apply only to targets created after it is called. " "The command will apply only to targets created after it is called. "
"For historical reasons, relative paths given to this command are " "Relative paths given to this command are interpreted as relative to "
"passed to the linker unchanged " "the current source directory, see CMP0015. \n"
"(unlike many CMake commands which interpret them relative to the "
"current source directory).\n"
"Note that this command is rarely necessary. Library locations " "Note that this command is rarely necessary. Library locations "
"returned by find_package() and find_library() are absolute paths. " "returned by find_package() and find_library() are absolute paths. "
"Pass these absolute library file paths directly to the " "Pass these absolute library file paths directly to the "