[asterisk-scf-commits] asterisk-scf/integration/gitall.git branch "ice-package" created.

Commits to the Asterisk SCF project code repositories asterisk-scf-commits at lists.digium.com
Mon Jan 17 15:27:53 CST 2011


branch "ice-package" has been created
        at  d4d11e196a1276c10e8e460dff3b7711a827ffc6 (commit)

- Log -----------------------------------------------------------------
commit d4d11e196a1276c10e8e460dff3b7711a827ffc6
Merge: 0e011ca 918d31c
Author: Kevin P. Fleming <kpfleming at digium.com>
Date:   Mon Jan 17 15:27:34 2011 -0600

    Merge branch 'master' into ice-package


commit 0e011ca1feb21b68d122d4f6a57a453df3cdabcb
Author: Kevin P. Fleming <kpfleming at digium.com>
Date:   Mon Jan 17 15:27:04 2011 -0600

    Minor changes to support the new FindIce.cmake module

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 04e9644..c74ca3c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,13 +6,16 @@ cmake_minimum_required(VERSION 2.6)
 # Indicate that this is an integrated build
 set(integrated_build true)
 
+# Make our additional CMake modules available
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules")
+
 # Include pjproject build integration
 include(${CMAKE_SOURCE_DIR}/cmake/modules/pjproject.cmake)
 
 # Include common AsteriskSCF build infrastructure
 include(${CMAKE_SOURCE_DIR}/cmake/AsteriskSCF.cmake)
 
-# This project is C++ based and requires a minimum of Ice 3.4
+# This project requires Ice 3.4.x
 asterisk_scf_project("Asterisk SCF" 3.4)
 
 # asterisk_scf_slice_plugins("SliceVisitorPattern:create")

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


-- 
asterisk-scf/integration/gitall.git



More information about the asterisk-scf-commits mailing list