[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  88e28bfed27fef6f4c3b94578437e05aa6e139f9 (commit)
      from  e1fa29a75eb39f7392eaf219f8110085e9e454d5 (commit)

Summary of changes:
 AsteriskSCF.cmake |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)


- Log -----------------------------------------------------------------
commit 88e28bfed27fef6f4c3b94578437e05aa6e139f9
Author: Brent Eagles <beagles at digium.com>
Date:   Thu Feb 16 15:30:40 2012 -0330

    Search for slice2cpp in 64 bit subdirectory for some types of ice installs.

diff --git a/AsteriskSCF.cmake b/AsteriskSCF.cmake
index 2d046ba..a2e2b8a 100644
--- a/AsteriskSCF.cmake
+++ b/AsteriskSCF.cmake
@@ -695,6 +695,14 @@ function(astscf_component_add_slices COMPONENT COLLECTION)
     message(FATAL_ERROR "Slice collection ${COLLECTION} has not been defined.")
   endif()
 
+  set(_x64dir "")
+  if(${CMAKE_CL_64})
+      set(_x64dir "${ICE_DIR}/bin/x64")
+  endif()
+
+  find_program(SLICE_COMPILER slice2cpp PATHS "${ICE_DIR}/bin" "${_x64dir}"
+      NO_DEFAULT_PATH)
+
   if(NOT SLICE_COMPILER)
     # Find the actual Slice compiler
     find_program(SLICE_COMPILER slice2cpp PATHS "${ICE_DIR}/bin"

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


-- 
asterisk-scf/release/cmake.git