[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  4eeb74a93bcdcef40603266719ae6d3645c5e3fd (commit)
       via  3b77216c1ef9de3e43feb92e65f9313f2602db30 (commit)
      from  efdcbf7711c72753a3cc90ad568760d163ffa097 (commit)

Summary of changes:
 AsteriskSCF.cmake |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)


- Log -----------------------------------------------------------------
commit 4eeb74a93bcdcef40603266719ae6d3645c5e3fd
Author: David M. Lee <dlee at digium.com>
Date:   Fri Nov 5 13:26:38 2010 -0500

    Fixed logic for adding Ice to lib search path.

diff --git a/AsteriskSCF.cmake b/AsteriskSCF.cmake
index 2b277b4..0ca01b7 100644
--- a/AsteriskSCF.cmake
+++ b/AsteriskSCF.cmake
@@ -180,14 +180,17 @@ function(find_ICE_CXX_library LIBRARY)
         elseif(UNIX)
             find_library(ICE_CXX_LIB_${LIBRARY} ${LIBRARY} PATHS "${ICE_DIR}/lib" "${ICE_DIR}/lib32" "${ICE_DIR}/lib64" NO_DEFAULT_PATH)
             if(ICE_CXX_LIB_${LIBRARY})
-	        get_filename_component(library_path ${ICE_CXX_LIB_${LIBRARY}} PATH)
-	        link_directories(${library_path})
 	        message(STATUS "Found Ice ${LIBRARY} library for CXX at ${ICE_CXX_LIB_${LIBRARY}}")
             else()
 	        message(FATAL_ERROR "Failed to find Ice ${LIBRARY} library for CXX")
             endif()
         endif()
     endif()
+
+    if(UNIX)
+	get_filename_component(library_path ${ICE_CXX_LIB_${LIBRARY}} PATH)
+	link_directories(${library_path})
+    endif()
 endfunction()
 
 # Find an Ice assembly for CSharp components

commit 3b77216c1ef9de3e43feb92e65f9313f2602db30
Author: David M. Lee <dlee at digium.com>
Date:   Fri Nov 5 13:16:01 2010 -0500

    Removed redundant Copyright statement.

diff --git a/AsteriskSCF.cmake b/AsteriskSCF.cmake
index 9d86659..2b277b4 100644
--- a/AsteriskSCF.cmake
+++ b/AsteriskSCF.cmake
@@ -17,8 +17,6 @@
 # Asterisk SCF component build infrastructure
 
 #
-# Copyright (C) 2010 - Digium, Inc.
-#
 # Coding/style guidelines:
 #
 # * Variables local to a function should be named using lowercase.

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


-- 
asterisk-scf/release/cmake.git