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

Commits to the Asterisk SCF project code repositories asterisk-scf-commits at lists.digium.com
Tue Jul 19 14:01:58 CDT 2011


branch "master" has been updated
       via  311188c17f51f018fa943ab6007a0733fa7fea10 (commit)
       via  2e3d895cfe70b95237d9d8461516b4a0f682702b (commit)
      from  097dcef6e04c45c9537a61e4fa8ab906a814f742 (commit)

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


- Log -----------------------------------------------------------------
commit 311188c17f51f018fa943ab6007a0733fa7fea10
Merge: 097dcef 2e3d895
Author: Kevin P. Fleming <kpfleming at digium.com>
Date:   Tue Jul 19 14:01:56 2011 -0500

    Merge branch 'master' of git://git.asterisk.org/asterisk-scf/release/cmake


commit 2e3d895cfe70b95237d9d8461516b4a0f682702b
Author: Kevin P. Fleming <kpfleming at digium.com>
Date:   Tue Jul 19 14:00:47 2011 -0500

    Change to expect CMAKE_BUILD_TYPE to be uppercase.
    
    CMake doesn't allow string comparisons to be done case-insensitively; the
    main AsteriskSCF script was changed to set CMAKE_BUILD_TYPE to be uppercase
    instead of lowercase, and as a result the comparison here needs to also be
    uppercase.

diff --git a/modules/FindIceBox.cmake b/modules/FindIceBox.cmake
index 6c493e0..dc27d4f 100644
--- a/modules/FindIceBox.cmake
+++ b/modules/FindIceBox.cmake
@@ -88,7 +88,7 @@ endfunction()
 if(NOT ICEBOX_FOUND)
   _ice_find_program(icebox)
 
-  if(CMAKE_BUILD_TYPE STREQUAL debug)
+  if(CMAKE_BUILD_TYPE STREQUAL DEBUG)
     _ice_set_cache_filepath(ICEBOX_EXECUTABLE "${ICE_ICEBOX_PROGRAM_DEBUG}" "Path to a program.")
   else()
     _ice_set_cache_filepath(ICEBOX_EXECUTABLE "${ICE_ICEBOX_PROGRAM_RELEASE}" "Path to a program.")

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


-- 
asterisk-scf/integration/gitall.git



More information about the asterisk-scf-commits mailing list