[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  02faccc91efe3c5337e4264552575f20692192f8 (commit)
      from  ca3edc48e010bc44f2a9964a72db9ad5f5b4a2cd (commit)

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


- Log -----------------------------------------------------------------
commit 02faccc91efe3c5337e4264552575f20692192f8
Author: David M. Lee <dlee at digium.com>
Date:   Wed Jan 19 14:24:57 2011 -0600

    Fixed Windows build for self-installed VC10 or x64.
    
    Ice is inconsistent where libraries go.  When installed using their .msi,
    it's in lib[\vc10][\x64].  When installed using make install, it's just
    in lib.

diff --git a/modules/FindIce.cmake b/modules/FindIce.cmake
index cc9bac3..1892135 100644
--- a/modules/FindIce.cmake
+++ b/modules/FindIce.cmake
@@ -135,7 +135,9 @@ function(_ice_find_library library)
     if(CMAKE_CL_64)
       set(_ice_libdir "${_ice_libdir}/x64")
     endif()
-    list(APPEND _ice_libdirs "${_ice_libdir}")
+    # first search the more specified libdir, as used by the .msi installer
+    # 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")
   endif()

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


-- 
asterisk-scf/release/cmake.git