[Cmake-commits] CMake branch, master, updated. v2.8.9-17-g85f843a

[David Cole]

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, master has been updated
       via  85f843a7b4aaf1b25e1e1e60ecdae3a3e2d7a9cb (commit)
       via  af80da349bb259ccccac146cdd734afeedeec116 (commit)
       via  733726edf61aa7889b57aa9490cb719c83d3ea0f (commit)
       via  54add62f1b36ffc25f333762901e14b2def21db2 (commit)
       via  6ca2f82d0d8dbb1f0f79c5fe1a4e21de78a57c84 (commit)
       via  1fe4b82a45bfe3e578267d84c70d6e55610e2ced (commit)
      from  e93d9c5c2b8095cf94ebb92763604db0108e0818 (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=85f843a7b4aaf1b25e1e1e60ecdae3a3e2d7a9cb
commit 85f843a7b4aaf1b25e1e1e60ecdae3a3e2d7a9cb
Merge: e93d9c5 af80da3
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Mon Aug 13 13:26:57 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Aug 13 13:26:57 2012 -0400

    Merge topic 'mixed-lib-to-lib64'
    
    af80da3 remove lib64 Unix paths if the respective lib path is also given
    733726e find_library: Fix mixed lib->lib64 (non-)conversion cases (#13419)
    54add62 find_library: Simplify lib->lib<arch> expansion
    6ca2f82 find_library: Refactor lib->lib64 conversion
    1fe4b82 find_library: Add test covering lib->lib64 cases


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

Summary of changes:
 Modules/FindBLAS.cmake                             |    4 +-
 Modules/FindGTK2.cmake                             |    2 -
 Modules/FindLAPACK.cmake                           |    4 +-
 Source/cmFindLibraryCommand.cxx                    |  114 +++++++-------------
 Source/cmFindLibraryCommand.h                      |    5 +-
 Tests/CMakeOnly/CMakeLists.txt                     |    2 +
 Tests/CMakeOnly/find_library/CMakeLists.txt        |   61 +++++++++++
 .../CMakeOnly/find_library/lib/64/libtest2.a       |    0
 .../CMakeOnly/find_library/lib/A/lib/libtest1.a    |    0
 .../CMakeOnly/find_library/lib/A/lib64/libtest3.a  |    0
 .../CMakeOnly/find_library/lib/A/libtest1.a        |    0
 .../CMakeOnly/find_library/lib/libtest1.a          |    0
 .../CMakeOnly/find_library/lib/libtest2.a          |    0
 .../CMakeOnly/find_library/lib/libtest3.a          |    0
 .../CMakeOnly/find_library/lib64/A/lib/libtest2.a  |    0
 .../find_library/lib64/A/lib64/libtest1.a          |    0
 .../CMakeOnly/find_library/lib64/A/libtest1.a      |    0
 .../CMakeOnly/find_library/lib64/libtest1.a        |    0
 18 files changed, 112 insertions(+), 80 deletions(-)
 create mode 100644 Tests/CMakeOnly/find_library/CMakeLists.txt
 copy Modules/IntelVSImplicitPath/hello.f => Tests/CMakeOnly/find_library/lib/64/libtest2.a (100%)
 copy Modules/IntelVSImplicitPath/hello.f => Tests/CMakeOnly/find_library/lib/A/lib/libtest1.a (100%)
 copy Modules/IntelVSImplicitPath/hello.f => Tests/CMakeOnly/find_library/lib/A/lib64/libtest3.a (100%)
 copy Modules/IntelVSImplicitPath/hello.f => Tests/CMakeOnly/find_library/lib/A/libtest1.a (100%)
 copy Modules/IntelVSImplicitPath/hello.f => Tests/CMakeOnly/find_library/lib/libtest1.a (100%)
 copy Modules/IntelVSImplicitPath/hello.f => Tests/CMakeOnly/find_library/lib/libtest2.a (100%)
 copy Modules/IntelVSImplicitPath/hello.f => Tests/CMakeOnly/find_library/lib/libtest3.a (100%)
 copy Modules/IntelVSImplicitPath/hello.f => Tests/CMakeOnly/find_library/lib64/A/lib/libtest2.a (100%)
 copy Modules/IntelVSImplicitPath/hello.f => Tests/CMakeOnly/find_library/lib64/A/lib64/libtest1.a (100%)
 copy Modules/IntelVSImplicitPath/hello.f => Tests/CMakeOnly/find_library/lib64/A/libtest1.a (100%)
 copy Modules/IntelVSImplicitPath/hello.f => Tests/CMakeOnly/find_library/lib64/libtest1.a (100%)


hooks/post-receive
-- 
CMake