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

[Commits to the Asterisk SCF project code repositories]

branch "ice-package" has been updated
       via  db3fd82065079731b36757d4e0cc786e229234f7 (commit)
      from  f52483c9a01c9c775f25fa810d35cd77bca507f8 (commit)

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


- Log -----------------------------------------------------------------
commit db3fd82065079731b36757d4e0cc786e229234f7
Author: Kevin P. Fleming <kpfleming at digium.com>
Date:   Thu Jan 13 14:21:20 2011 -0600

    Fix up remembering library locations in cache.

diff --git a/modules/FindIce.cmake b/modules/FindIce.cmake
index d9b2f31..fe311ee 100644
--- a/modules/FindIce.cmake
+++ b/modules/FindIce.cmake
@@ -5,6 +5,7 @@
 # ICE_INCLUDE_DIR
 # ICE_SLICE_DIR
 # ICE_CXX_FLAGS
+# ICE_Ice_FOUND
 # ICE_Ice_LIBRARY
 # ICE_Ice_LIBRARY_DEBUG
 # ICE_Ice_LIBRARY_RELEASE
@@ -27,6 +28,18 @@ function(_ice_set_cache_string var value reason)
   mark_as_advanced(FORCE ${var})
 endfunction()
 
+function(_ice_find_library library)
+  find_library(ICE_${library}_LIBRARY_RELEASE NAMES "${library}" NO_DEFAULT_PATH PATHS "${ICE_DIR}" PATH_SUFFIXES "lib" "lib32" "lib64")
+  find_library(ICE_${library}_LIBRARY_DEBUG NAMES "${library}${_ice_debug_suffix}" NO_DEFAULT_PATH PATHS "${ICE_DIR}" PATH_SUFFIXES "lib" "lib32" "lib64")
+  
+  if(Ice_DEBUG)
+    message(STATUS
+      "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+      "${library} library (release) found at ${ICE_${library}_LIBRARY_RELEASE} "
+      "${library} library (debug) found at ${ICE_${library}_LIBRARY_DEBUG} ")
+  endif()
+endfunction()
+
 # Lifted from FindBoost.cmake, which got it from FindQt4.cmake.
 
 macro(_ice_adjust_lib_vars library)
@@ -44,13 +57,13 @@ macro(_ice_adjust_lib_vars library)
 
   # if only the release version was found, set the debug variable also to the release version
   if(ICE_${library}_LIBRARY_RELEASE AND NOT ICE_${library}_LIBRARY_DEBUG)
-    set(ICE_${library}_LIBRARY_DEBUG ${ICE_${library}_LIBRARY_RELEASE})
+    set(ICE_${library}_LIBRARY_DEBUG ${ICE_${library}_LIBRARY_RELEASE} CACHE FILEPATH)
     set(ICE_${library}_LIBRARY       ${ICE_${library}_LIBRARY_RELEASE})
   endif()
 
   # if only the debug version was found, set the release variable also to the debug version
   if(ICE_${library}_LIBRARY_DEBUG AND NOT ICE_${library}_LIBRARY_RELEASE)
-    set(ICE_${library}_LIBRARY_RELEASE ${ICE_${library}_LIBRARY_DEBUG})
+    set(ICE_${library}_LIBRARY_RELEASE ${ICE_${library}_LIBRARY_DEBUG} CACHE FILEPATH)
     set(ICE_${library}_LIBRARY         ${ICE_${library}_LIBRARY_DEBUG})
   endif()
   
@@ -63,18 +76,6 @@ macro(_ice_adjust_lib_vars library)
   mark_as_advanced(ICE_${library}_LIBRARY ICE_${library}_LIBRARY_RELEASE ICE_${library}_LIBRARY_DEBUG)
 endmacro()
 
-function(_ice_find_library library)
-  find_library(ICE_${library}_LIBRARY_RELEASE NAMES "${library}" NO_DEFAULT_PATH PATHS "${ICE_DIR}" PATH_SUFFIXES "lib" "lib32" "lib64")
-  find_library(ICE_${library}_LIBRARY_DEBUG NAMES "${library}${_ice_debug_suffix}" NO_DEFAULT_PATH PATHS "${ICE_DIR}" PATH_SUFFIXES "lib" "lib32" "lib64")
-  
-  if(Ice_DEBUG)
-    message(STATUS
-      "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
-      "${library} library (release) found at ${ICE_${library}_LIBRARY_RELEASE} "
-      "${library} library (debug) found at ${ICE_${library}_LIBRARY_DEBUG} ")
-  endif()
-endfunction()
-
 if(NOT ICE_DIR)
   if(NOT Ice_FIND_VERSION)
     find_package_handle_standard_args(Ice "Major and minor version numbers (at least) must be supplied to find Ice." ICE_DIR)

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


-- 
asterisk-scf/release/cmake.git