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

[Commits to the Asterisk SCF project code repositories]

branch "disintegrated-build" has been updated
       via  9a6ed1b4d597081841c48200aeecd8e26f2d7301 (commit)
       via  0dde9ec8053a53626d56a38b0fc282b7e1589092 (commit)
       via  33c5f5478073eaf8a58ac9c60108937f2d465b90 (commit)
       via  97a9bbc7874612f35b47e2067bec937c201f395b (commit)
      from  d6414ce21a5fceed6371c4ac0754dd6758a14eb8 (commit)

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


- Log -----------------------------------------------------------------
commit 9a6ed1b4d597081841c48200aeecd8e26f2d7301
Merge: 33c5f54 0dde9ec
Author: Kevin P. Fleming <kpfleming at digium.com>
Date:   Fri Jun 17 11:46:01 2011 -0500

    Merge branch 'disintegrated-build' of git://git.asterisk.org/asterisk-scf/integration/cmake into disintegrated-build


commit 0dde9ec8053a53626d56a38b0fc282b7e1589092
Author: Kevin P. Fleming <kpfleming at digium.com>
Date:   Fri Jun 17 11:45:06 2011 -0500

    Automatically add 'include' subdirectory to search path.
    
    If a project has a subdirectory named 'include', astscf_project() will now
    automatically add it to the include file search path for that project's
    directory and subdirectories.

diff --git a/AsteriskSCF.cmake b/AsteriskSCF.cmake
index b2cdefa..70fa132 100644
--- a/AsteriskSCF.cmake
+++ b/AsteriskSCF.cmake
@@ -273,6 +273,12 @@ endmacro()
 
 # Function which initializes project specific things
 function(astscf_project NAME ICE_VERSION)
+  message(STATUS "Setting up project ${NAME} for Ice version ${ICE_VERSION}")
+
+  if(IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include")
+    include_directories(include)
+  endif()
+
   if(ASTSCF_MASTER_PROJECT)
     # this is a sub-project, so just record the name and
     # move on
@@ -290,8 +296,6 @@ function(astscf_project NAME ICE_VERSION)
     set(ASTSCF_MASTER_PROJECT true PARENT_SCOPE)
   endif()
 
-  message(STATUS "Setting up project ${NAME} for Ice version ${ICE_VERSION}")
-
   set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/lib" PARENT_SCOPE)
   set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/lib" PARENT_SCOPE)
   set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/bin" PARENT_SCOPE)

commit 33c5f5478073eaf8a58ac9c60108937f2d465b90
Merge: d6414ce 97a9bbc
Author: Kevin P. Fleming <kpfleming at digium.com>
Date:   Fri Jun 17 07:44:48 2011 -0500

    Merge branch 'disintegrated-build' of git://git.asterisk.org/asterisk-scf/integration/cmake into disintegrated-build


commit 97a9bbc7874612f35b47e2067bec937c201f395b
Author: Kevin P. Fleming <kpfleming at digium.com>
Date:   Fri Jun 17 07:43:36 2011 -0500

    Update the one WIN32-specific call to __astscf_set_cache_string().

diff --git a/AsteriskSCF.cmake b/AsteriskSCF.cmake
index d83d3f6..b2cdefa 100644
--- a/AsteriskSCF.cmake
+++ b/AsteriskSCF.cmake
@@ -310,7 +310,7 @@ function(astscf_project NAME ICE_VERSION)
   # On Windows, 'debug' libraries should have a "d" suffix to indicate that they
   # are debug libraries
   if(WIN32)
-    __astscf_set_cache_string(CMAKE_DEBUG_POSTFIX "d")
+    __astscf_set_cache_string(CMAKE_DEBUG_POSTFIX "d" "" ADVANCED)
   endif()
 
   message(STATUS "Performing requirement checks for components")

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


-- 
asterisk-scf/integration/gitall.git