[asterisk-scf-commits] asterisk-scf/release/cmake.git branch "master" updated.

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  698a7ad108ed398c10cbfe82768b6bb8fa811b87 (commit)
      from  4b00f584ee6f3ed0763124efb90fdbb0f108d77b (commit)

Summary of changes:
 AsteriskSCF.cmake     |    4 ++++
 modules/FindIce.cmake |    2 +-
 2 files changed, 5 insertions(+), 1 deletions(-)


- Log -----------------------------------------------------------------
commit 698a7ad108ed398c10cbfe82768b6bb8fa811b87
Author: Kevin P. Fleming <kpfleming at digium.com>
Date:   Wed Apr 27 09:51:07 2011 -0500

    Use a CMake global property to let it automatically search lib64 directories
    on UNIX-type platforms when a 64-bit build is being done.

diff --git a/AsteriskSCF.cmake b/AsteriskSCF.cmake
index e568b5a..c97179e 100644
--- a/AsteriskSCF.cmake
+++ b/AsteriskSCF.cmake
@@ -146,6 +146,10 @@ if(WIN32)
     endif()
 endif()
 
+if(UNIX)
+  set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS true)
+endif()
+
 if(${CMAKE_BUILD_TYPE} STREQUAL profile)
     message(STATUS "Disabling shared libs.")
     set(BUILD_SHARED_LIBS false
diff --git a/modules/FindIce.cmake b/modules/FindIce.cmake
index f0ffb20..a300d39 100644
--- a/modules/FindIce.cmake
+++ b/modules/FindIce.cmake
@@ -143,7 +143,7 @@ function(_ice_find_library library)
     # if it's not there, try just lib.  that's where make install puts it
     list(APPEND _ice_libdirs "${_ice_libdir}" "lib")
   elseif(UNIX)
-    list(APPEND _ice_libdirs "lib" "lib32" "lib64")
+    list(APPEND _ice_libdirs "lib")
   endif()
 
   find_library(ICE_${upper}_LIBRARY_RELEASE NAMES "${library}" NO_DEFAULT_PATH HINTS "${ICE_DIR}" PATH_SUFFIXES ${_ice_libdirs})

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


-- 
asterisk-scf/release/cmake.git