[asterisk-scf-commits] asterisk-scf/integration/gitall.git branch "master" updated.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Fri Jan 7 15:13:57 UTC 2011
branch "master" has been updated
via e7646a3cfca41b1c1b2a8cafdb68e822aa235085 (commit)
via 18f242e56c8cd40f802f52952bdc62c88f464851 (commit)
from 5af5eec4061e636a01fd714f48f9ad601bd76922 (commit)
Summary of changes:
CMakeLists.txt | 4 +++-
README.txt | 20 +++++++++-----------
2 files changed, 12 insertions(+), 12 deletions(-)
- Log -----------------------------------------------------------------
commit e7646a3cfca41b1c1b2a8cafdb68e822aa235085
Merge: 18f242e 5af5eec
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Fri Jan 7 09:13:53 2011 -0600
Merge branch 'master' of git.asterisk.org:asterisk-scf/integration/gitall
commit 18f242e56c8cd40f802f52952bdc62c88f464851
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Fri Jan 7 09:13:42 2011 -0600
Fix some typos and repository URL.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9b2d5a8..a224cfd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,9 +12,11 @@ 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 3.4
+# This project is C++ based and requires a minimum of Ice 3.4
asterisk_scf_project("Asterisk SCF" 3.4 CXX)
+asterisk_scf_slice_plugins("SliceVisitorPattern:create")
+
# Add build targets for what we will need to link against
pjproject_build(pjlib)
pjproject_build(pjlib-util)
diff --git a/README.txt b/README.txt
index 9327e07..daf11a2 100644
--- a/README.txt
+++ b/README.txt
@@ -3,22 +3,20 @@
README.txt - Asterisk SCF gitall repo
-------------------------------------
-Prequisites
------------
- a.) You have SSH certificate installed so that ssh-agent can be
- used.
- b.) You have Git installed and on the path. Note that Git on Windows
+Prerequisites
+-------------
+ a.) You have Git installed and on the path. Note that Git on Windows
comes with a Bash interpreter for running provided scripts.
- c.) You have Boost libs installed.
- d.) You have lua installed.
- e.) You have Cmake installed.
- f.) Ice version 3.4 installed. Note that we have patches that have
+ b.) You have Boost libs installed.
+ c.) You have lua installed.
+ d.) You have Cmake installed.
+ e.) Ice version 3.4 installed. Note that we have patches that have
not yet been accepted upstream. Clone
- git at git.asterisk.org:asterisk-scf/release/ice and build from
+ git://git.asterisk.org:asterisk-scf/release/ice and build from
source. If you choose to install Ice in a non-default location,
you'll have to set ICE_HOME to tell the build system where it is.
-To set up for an intergrated build:
+To set up for an integrated build:
------------------------------------
Note: '$' prompt is for Linux users, '>' prompt for Windows users.
-----------------------------------------------------------------------
--
asterisk-scf/integration/gitall.git
More information about the asterisk-scf-commits
mailing list