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

Commits to the Asterisk SCF project code repositories asterisk-scf-commits at lists.digium.com
Thu Jan 13 14:28:16 CST 2011


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

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


- Log -----------------------------------------------------------------
commit 0c9f1a7e250a7be889ea7bbc7a13cf20303d3fe0
Author: Kevin P. Fleming <kpfleming at digium.com>
Date:   Thu Jan 13 14:28:13 2011 -0600

    Make overwriting of find_library() results actually work.

diff --git a/modules/FindIce.cmake b/modules/FindIce.cmake
index fe311ee..854fa63 100644
--- a/modules/FindIce.cmake
+++ b/modules/FindIce.cmake
@@ -57,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} CACHE FILEPATH)
+    set(ICE_${library}_LIBRARY_DEBUG ${ICE_${library}_LIBRARY_RELEASE} CACHE FILEPATH "Path to a library." FORCE)
     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} CACHE FILEPATH)
+    set(ICE_${library}_LIBRARY_RELEASE ${ICE_${library}_LIBRARY_DEBUG} CACHE FILEPATH "Path to a library." FORCE)
     set(ICE_${library}_LIBRARY         ${ICE_${library}_LIBRARY_DEBUG})
   endif()
   

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


-- 
asterisk-scf/release/cmake.git



More information about the asterisk-scf-commits mailing list