[asterisk-scf-commits] asterisk-scf/release/sip.git branch "master" updated.

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  2f677db5d331e2cca20ac21a93ee0cf4eac59f7b (commit)
      from  285b25605ba5ca2c6ccd3ff1d77a8e547529cc4a (commit)

Summary of changes:
 CMakeLists.txt   |   12 ++++++------
 CMakeSubDirs.txt |    8 --------
 2 files changed, 6 insertions(+), 14 deletions(-)
 delete mode 100644 CMakeSubDirs.txt


- Log -----------------------------------------------------------------
commit 2f677db5d331e2cca20ac21a93ee0cf4eac59f7b
Author: David M. Lee <dlee at digium.com>
Date:   Thu Jan 13 15:25:46 2011 -0600

    Removed old CMakeSubDirs.txt file

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6900dba..8a849ee 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,10 +13,11 @@ if(NOT integrated_build STREQUAL "true")
    # Minimum we require is 2.6
    cmake_minimum_required(VERSION 2.6)
 
-   # Include common AsteriskSCF build infrastructure. Make sure your submodules are pulled. 
+   # Include common AsteriskSCF build infrastructure. Make sure your submodules
+   # are pulled.
    include(cmake/AsteriskSCF.cmake)
 
-   # This project is C++ based and requires a minimum of 3.4 of Ice. 
+   # This project is C++ based and requires a minimum of 3.4 of Ice.
    asterisk_scf_project(SipSessionManager 3.4 CXX)
 
    # Include pjproject build integration
@@ -36,7 +37,6 @@ if(NOT integrated_build STREQUAL "true")
    add_subdirectory(logger)
 endif()
 
-# Include the subdirectory information. This is separate so that
-# a higher-level CMakeLists.txt can act as a master for integrated
-# builds.
-include(CMakeSubDirs.txt)
+add_subdirectory(local-slice)
+add_subdirectory(src)
+add_subdirectory(test)
diff --git a/CMakeSubDirs.txt b/CMakeSubDirs.txt
deleted file mode 100644
index 6ad9e82..0000000
--- a/CMakeSubDirs.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-
-add_subdirectory(local-slice)
-
-# Add our component's source code 
-add_subdirectory(src)
-
-# Pull in the test suite
-add_subdirectory(test)
\ No newline at end of file

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


-- 
asterisk-scf/release/sip.git