[asterisk-scf-commits] asterisk-scf/integration/slice-plugins.git branch "master" updated.

Commits to the Asterisk SCF project code repositories asterisk-scf-commits at lists.digium.com
Thu Jan 6 23:58:49 UTC 2011


branch "master" has been updated
       via  48ced450203f5dfff2417c0e0ea09b0c33904515 (commit)
      from  d94bbeb493eff3ab76ec63a233c9960935492f15 (commit)

Summary of changes:
 CMakeLists.txt |   12 +-----------
 1 files changed, 1 insertions(+), 11 deletions(-)


- Log -----------------------------------------------------------------
commit 48ced450203f5dfff2417c0e0ea09b0c33904515
Author: Kevin P. Fleming <kpfleming at digium.com>
Date:   Thu Jan 6 17:58:45 2011 -0600

    Fix bug and remove IceBox testing.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1d3f585..5fa164f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -70,16 +70,6 @@ function(find_ICE version)
     endif()
     file(TO_CMAKE_PATH "${ice}" ice_cmake_path)
     set_cache_var(ICE_DIR "${ice_cmake_path}")
-
-    # find icebox executable
-    # XXX Need to look for iceboxd.exe for debug windows builds
-    find_program(ICEBOX icebox PATHS "${ICE_DIR}/bin" NO_DEFAULT_PATH)
-
-    if(ICEBOX)
-        message(STATUS "Found icebox at ${ICEBOX}")
-    else()
-        message(WARNING "Failed to find icebox ${ICE_DIR}")
-    endif()
 endfunction()
 
 # Find Ice headers and libraries for CXX components
@@ -153,7 +143,7 @@ endif()
 # On Windows, 'debug' libraries should have a "d" suffix to indicate that they
 # are debug libraries
 if(WIN32)
-  set(CMAKE_DEBUG_POSTFIX "d" PARENT_SCOPE)
+  set(CMAKE_DEBUG_POSTFIX "d")
 endif()
 
 find_ICE(3.4)

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


-- 
asterisk-scf/integration/slice-plugins.git



More information about the asterisk-scf-commits mailing list