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

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  ae7c89a9eb2db14909349e7dc6a71eb54f6c8e21 (commit)
      from  17a088ed09e3ce208e46f4d496357a3458e65fec (commit)

Summary of changes:
 CMakeLists.txt |   36 ++++++++++++++++++++----------------
 1 files changed, 20 insertions(+), 16 deletions(-)
 mode change 100644 => 100755 CMakeLists.txt


- Log -----------------------------------------------------------------
commit ae7c89a9eb2db14909349e7dc6a71eb54f6c8e21
Author: David M. Lee <dlee at digium.com>
Date:   Tue Sep 14 00:17:26 2010 -0500

    Simplify integrated build.  Instead of lots of special cases and file
    copying, we now just have an 'integrated' variable we can test to see
    if we're in an integrated build or not.

diff --git a/CMakeLists.txt b/CMakeLists.txt
old mode 100644
new mode 100755
index 877fc99..d7ea150
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,27 +8,31 @@
 
 # pjmedia RTP component build system
 
-# Minimum we require is 2.6, any lower and stuff would fail horribly
-cmake_minimum_required(VERSION 2.6)
+if(NOT integrated_build STREQUAL "true")
 
-# Include pjproject build integration
-include(cmake/modules/pjproject.cmake)
+   # Minimum we require is 2.6, any lower and stuff would fail horribly
+   cmake_minimum_required(VERSION 2.6)
 
-# Include common Hydra build infrastructure
-include(cmake/Hydra_v4.cmake)
+   # Include pjproject build integration
+   include(cmake/modules/pjproject.cmake)
 
-# Add build targets for what we will need to link against
-pjproject_build(pjlib)
-pjproject_build(pjlib-util)
-pjproject_build(pjnath)
-pjproject_build(pjmedia)
-pjproject_build(third_party)
+   # Include common Hydra build infrastructure
+   include(cmake/Hydra_v4.cmake)
 
-# This project is C++ based and requires a minimum of 3.4
-hydra_project(media_rtp_pjmedia 3.4 CXX)
+   # Add build targets for what we will need to link against
+   pjproject_build(pjlib)
+   pjproject_build(pjlib-util)
+   pjproject_build(pjnath)
+   pjproject_build(pjmedia)
+   pjproject_build(third_party)
 
-# Knock out slice definitions
-add_subdirectory(slice EXCLUDE_FROM_ALL)
+   # This project is C++ based and requires a minimum of 3.4
+   hydra_project(media_rtp_pjmedia 3.4 CXX)
+
+   # Knock out slice definitions
+   add_subdirectory(slice EXCLUDE_FROM_ALL)
+
+endif()
 
 # Include the subdirectory information. This is separate so that
 # a higher-level CMakeLists.txt can act as a master for integrated

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


-- 
asterisk-scf/integration/media_rtp_pjmedia.git