[Cmake-commits] CMake branch, next, updated. v2.8.4-1228-g74e410d

[Eric Noulard]

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  74e410dfe42fa0c59efaff3c180cc4413c0ccf46 (commit)
       via  86e272e8c6522ce70a6d12a94560cee4dcacdd32 (commit)
      from  862102ac44016bb3ac75ab41b2f25aa43b05c187 (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=74e410dfe42fa0c59efaff3c180cc4413c0ccf46
commit 74e410dfe42fa0c59efaff3c180cc4413c0ccf46
Merge: 862102a 86e272e
Author:     Eric Noulard <eric.noulard at gmail.com>
AuthorDate: Sun Mar 20 14:21:15 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Mar 20 14:21:15 2011 -0400

    Merge topic 'linux-lib64-handling' into next
    
    86e272e Disable automatic lib64 handling (this breaks [at least] SimpleInstall)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=86e272e8c6522ce70a6d12a94560cee4dcacdd32
commit 86e272e8c6522ce70a6d12a94560cee4dcacdd32
Author:     Eric NOULARD <eric.noulard at gmail.com>
AuthorDate: Sun Mar 20 19:19:44 2011 +0100
Commit:     Eric NOULARD <eric.noulard at gmail.com>
CommitDate: Sun Mar 20 19:19:44 2011 +0100

    Disable automatic lib64 handling (this breaks [at least] SimpleInstall)

diff --git a/Modules/Platform/Linux.cmake b/Modules/Platform/Linux.cmake
index 64d71ea..2ca853d 100644
--- a/Modules/Platform/Linux.cmake
+++ b/Modules/Platform/Linux.cmake
@@ -67,7 +67,10 @@ ELSE(EXISTS "/etc/debian_version")
                       OUTPUT_STRIP_TRAILING_WHITESPACE
                      )
       IF(LINUX_ARCH MATCHES "x86_64")
-        SET_PROPERTY(GLOBAL PROPERTY CMAKE_USE_LIB64_PATH TRUE)
+        #SET_PROPERTY(GLOBAL PROPERTY CMAKE_USE_LIB64_PATH TRUE)
+        # cannot enable this by as default because
+        # it breaks [at least] SimpleInstall
+        SET_PROPERTY(GLOBAL PROPERTY CMAKE_USE_LIB64_PATH FALSE)
       ELSE(LINUX_ARCH MATCHES "x86_64")
         SET_PROPERTY(GLOBAL PROPERTY CMAKE_USE_LIB64_PATH FALSE)
       ENDIF(LINUX_ARCH MATCHES "x86_64")

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

Summary of changes:
 Modules/Platform/Linux.cmake |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake