[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  f0e2117bb12b6560a746e5cc5147919541addddb (commit)
      from  999d481236d8830deb5603ac115072e97798f861 (commit)

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


- Log -----------------------------------------------------------------
commit f0e2117bb12b6560a746e5cc5147919541addddb
Author: Kevin P. Fleming <kpfleming at digium.com>
Date:   Thu Jan 13 13:33:00 2011 -0600

    Don't mark cache variables as INTERNAL.

diff --git a/modules/FindIce.cmake b/modules/FindIce.cmake
index f96bd26..ca05b5c 100644
--- a/modules/FindIce.cmake
+++ b/modules/FindIce.cmake
@@ -1,7 +1,20 @@
+#
+# sets:
+# ICE_FOUND
+# ICE_DIR
+# ICE_INCLUDE_DIR
+# ICE_SLICE_DIR
+# ICE_CXX_FLAGS
+
 find_package(PackageHandleStandardArgs)
 
-macro(set_cache_var var value reason)
-  set(${var} ${value} CACHE INTERNAL "${reason}" FORCE)
+macro(set_cache_path var value reason)
+  set(${var} ${value} CACHE PATH "${reason}" FORCE)
+  mark_as_advanced(FORCE ${var})
+endmacro()
+
+macro(set_cache_string var value reason)
+  set(${var} ${value} CACHE STRING "${reason}" FORCE)
   mark_as_advanced(FORCE ${var})
 endmacro()
 
@@ -85,12 +98,12 @@ if(NOT ICE_DIR)
     endif()
 
     if(NOT Ice_FIND_VERSION_EXACT)
-      set_cache_var(ICE_DIR "${possible_ice_dir}" "Location of Ice")
+      set_cache_path(ICE_DIR "${possible_ice_dir}" "Location of Ice")
       break()
     endif()
 
     if(${ice_version} VERSION_EQUAL ${Ice_FIND_VERSION})
-      set_cache_var(ICE_DIR "${possible_ice_dir}" "Location of Ice")
+      set_cache_path(ICE_DIR "${possible_ice_dir}" "Location of Ice")
       break()
     endif()
 
@@ -121,7 +134,7 @@ if(NOT ICE_DIR)
     # the benefit of having warnings emitted by the headers NOT treated as errors, even if the compiler has been told
     # to do so. This is being utilized so that Ice itself does not have to be updated to be C++0x safe.
     if(CMAKE_COMPILER_IS_GNUCXX)
-      set_cache_var(ICE_CXX_FLAGS "-isystem ${ICE_INCLUDE_DIR}" "Ice-specific compiler flags")
+      set_cache_string(ICE_CXX_FLAGS "-isystem ${ICE_INCLUDE_DIR}" "Ice-specific compiler flags")
     endif()
   endif()
 endif()

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


-- 
asterisk-scf/release/cmake.git