From edd8996fb4c048fb5b60768e930b270be8646180 Mon Sep 17 00:00:00 2001 From: Rolf Eike Beer Date: Fri, 30 Mar 2012 00:41:48 +0200 Subject: [PATCH 1/2] FILE: mention that TO_CMAKE_PATH also handles list delimiters --- Source/cmFileCommand.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Source/cmFileCommand.h b/Source/cmFileCommand.h index 3b368fa2d..ced26c49b 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" From 32c3be611cfef58f8d98f20f2cd71498a2dc1970 Mon Sep 17 00:00:00 2001 From: Rolf Eike Beer Date: Fri, 30 Mar 2012 00:41:52 +0200 Subject: [PATCH 2/2] FIND_LIBRARY: document FIND_LIBRARY_USE_LIB64_PATHS --- Source/cmFindLibraryCommand.cxx | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Source/cmFindLibraryCommand.cxx b/Source/cmFindLibraryCommand.cxx index a726849ad..6cdbbf2dc 100644 --- a/Source/cmFindLibraryCommand.cxx +++ b/Source/cmFindLibraryCommand.cxx @@ -57,7 +57,13 @@ void cmFindLibraryCommand::GenerateDocumentation() "the full path to the framework /A.framework. " "When a full path to a framework is used as a library, " "CMake will use a -framework A, and a -F 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