diff options
| author | David Cole <david.cole@kitware.com> | 2012-04-03 15:59:10 -0400 |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-04-03 15:59:10 -0400 |
| commit | 57e9f97b70ef406afcf8a73bb34105cda2cb204d (patch) | |
| tree | 41811e6d2093c7cfbd57b9774c4a8784573f7625 | |
| parent | ff575b229dd19c91fdd4065e8205759d0dfd2d16 (diff) | |
| parent | 32c3be611cfef58f8d98f20f2cd71498a2dc1970 (diff) | |
| download | cmake-57e9f97b70ef406afcf8a73bb34105cda2cb204d.tar.gz | |
Merge topic 'doc-improvements'
32c3be6 FIND_LIBRARY: document FIND_LIBRARY_USE_LIB64_PATHS
edd8996 FILE: mention that TO_CMAKE_PATH also handles list delimiters
| -rw-r--r-- | Source/cmFileCommand.h | 3 | ||||
| -rw-r--r-- | Source/cmFindLibraryCommand.cxx | 8 |
2 files changed, 9 insertions, 2 deletions
diff --git a/Source/cmFileCommand.h b/Source/cmFileCommand.h index 3b368fa2df..ced26c49bf 100644 --- a/Source/cmFileCommand.h +++ b/Source/cmFileCommand.h @@ -152,7 +152,8 @@ public: "TO_CMAKE_PATH will convert path into a cmake style path with unix /. " " The input can be a single path or a system path like \"$ENV{PATH}\". " " Note the double quotes around the ENV call TO_CMAKE_PATH only takes " - " one argument.\n" + " one argument. This command will also convert the native list" + " delimiters for a list of paths like the PATH environment variable.\n" "TO_NATIVE_PATH works just like TO_CMAKE_PATH, but will convert from " " a cmake style path into the native path style \\ for windows and / " "for UNIX.\n" diff --git a/Source/cmFindLibraryCommand.cxx b/Source/cmFindLibraryCommand.cxx index a726849ad4..6cdbbf2dc5 100644 --- a/Source/cmFindLibraryCommand.cxx +++ b/Source/cmFindLibraryCommand.cxx @@ -57,7 +57,13 @@ void cmFindLibraryCommand::GenerateDocumentation() "the full path to the framework <fullPath>/A.framework. " "When a full path to a framework is used as a library, " "CMake will use a -framework A, and a -F<fullPath> to " - "link the framework to the target. "; + "link the framework to the target." + "\n" + "If the global property FIND_LIBRARY_USE_LIB64_PATHS is set all search " + "paths will be tested as normal, with \"64/\" appended, and with all " + "matches of \"lib/\" replaced with \"lib64/\". This property is " + "automatically set for the platforms that are known to need it if at " + "least one of the languages supported by the PROJECT command is enabled."; } // cmFindLibraryCommand |