[Cmake-commits] CMake branch, next, updated. v2.8.7-3374-gac1dc84

Rolf Eike Beer eike at sf-mail.de
Thu Mar 29 18:43:31 EDT 2012


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  ac1dc84cfc767403a54ef3c5fcd194d33b877f49 (commit)
       via  32c3be611cfef58f8d98f20f2cd71498a2dc1970 (commit)
       via  edd8996fb4c048fb5b60768e930b270be8646180 (commit)
      from  bfadd7dea5b0f6d1928ecf6ee4edf2a9a0a7e500 (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=ac1dc84cfc767403a54ef3c5fcd194d33b877f49
commit ac1dc84cfc767403a54ef3c5fcd194d33b877f49
Merge: bfadd7d 32c3be6
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Thu Mar 29 18:43:28 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Mar 29 18:43:28 2012 -0400

    Merge topic 'doc-improvements' into next
    
    32c3be6 FIND_LIBRARY: document FIND_LIBRARY_USE_LIB64_PATHS
    edd8996 FILE: mention that TO_CMAKE_PATH also handles list delimiters


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=32c3be611cfef58f8d98f20f2cd71498a2dc1970
commit 32c3be611cfef58f8d98f20f2cd71498a2dc1970
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Fri Mar 30 00:41:52 2012 +0200
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Fri Mar 30 00:41:52 2012 +0200

    FIND_LIBRARY: document FIND_LIBRARY_USE_LIB64_PATHS

diff --git a/Source/cmFindLibraryCommand.cxx b/Source/cmFindLibraryCommand.cxx
index a726849..6cdbbf2 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

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=edd8996fb4c048fb5b60768e930b270be8646180
commit edd8996fb4c048fb5b60768e930b270be8646180
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Fri Mar 30 00:41:48 2012 +0200
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Fri Mar 30 00:41:48 2012 +0200

    FILE: mention that TO_CMAKE_PATH also handles list delimiters

diff --git a/Source/cmFileCommand.h b/Source/cmFileCommand.h
index 3b368fa..ced26c4 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"

-----------------------------------------------------------------------

Summary of changes:
 Source/cmFileCommand.h          |    3 ++-
 Source/cmFindLibraryCommand.cxx |    8 +++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list