[asterisk-scf-commits] asterisk-scf/integration/cmake.git branch "c++0x" updated.

[Commits to the Asterisk SCF project code repositories]

branch "c++0x" has been updated
       via  404f40b1e95062113a7dfef3aaad220b9a3a0eb5 (commit)
      from  f0f82cec7e12fd29137c35649efc367a0a480138 (commit)

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


- Log -----------------------------------------------------------------
commit 404f40b1e95062113a7dfef3aaad220b9a3a0eb5
Author: Joshua Colp <jcolp at digium.com>
Date:   Thu Dec 2 15:07:35 2010 -0400

    Don't double add -std=c++0x.
    
    Thanks David!

diff --git a/AsteriskSCF.cmake b/AsteriskSCF.cmake
index 7f52e4d..88f3cd3 100644
--- a/AsteriskSCF.cmake
+++ b/AsteriskSCF.cmake
@@ -99,7 +99,7 @@ endif()
 if(CMAKE_COMPILER_IS_GNUCXX)
     set(CMAKE_CXX_FLAGS "${CPP_ZEROX_STD}"
         CACHE STRING "Flags used by the compiler during release builds." FORCE)
-    set(CMAKE_CXX_FLAGS_DEBUG "-Werror -Wall -g3 ${CPP_ZEROX_STD}"
+    set(CMAKE_CXX_FLAGS_DEBUG "-Werror -Wall -g3"
         CACHE STRING "Flags used by the compiler during debug builds." FORCE)
 endif()
 
@@ -224,8 +224,6 @@ function(find_ICE_CXX)
     if(CMAKE_COMPILER_IS_GNUCXX)
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isystem ${ICE_CXX_INCLUDE_DIR}"
             CACHE STRING "Flags used by the compiler during release builds." FORCE)
-        set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -isystem ${ICE_CXX_INCLUDE_DIR}"
-            CACHE STRING "Flags used by the compiler during debug builds." FORCE)
     endif()
 endfunction()
 

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


-- 
asterisk-scf/integration/cmake.git