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

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  5f41415fd3e416970f90b5242213aa48f43a46d4 (commit)
       via  e8a3fb604f5cbb8724fb208faac3fd61a7c57c7e (commit)
      from  e645957c74f6bc2ae22622e2b3bd975842025915 (commit)

Summary of changes:
 init-cmake.sh |   20 +++++++++++++-------
 1 files changed, 13 insertions(+), 7 deletions(-)


- Log -----------------------------------------------------------------
commit 5f41415fd3e416970f90b5242213aa48f43a46d4
Merge: e8a3fb6 e645957
Author: Kevin P. Fleming <kpfleming at digium.com>
Date:   Fri Jan 7 11:07:05 2011 -0600

    Merge branch 'master' of git.asterisk.org:asterisk-scf/release/cmake
    
    Conflicts:
    	init-cmake.sh

diff --cc init-cmake.sh
index dcd1154,2e9b784..1eb0bd7
--- a/init-cmake.sh
+++ b/init-cmake.sh
@@@ -83,7 -81,7 +83,7 @@@ while test $# -gt 0; d
           shift
           ;;
        --nmake)
-          cmake_output="Visual Studio 9 2008"
 -         add_cmake_args -G "NMake Makefiles"
++         cmake_output="NMake Makefiles"
           shift
           ;;
        --subdir)

commit e8a3fb604f5cbb8724fb208faac3fd61a7c57c7e
Author: Kevin P. Fleming <kpfleming at digium.com>
Date:   Fri Jan 7 11:05:00 2011 -0600

    Don't tell CMake two output types when one is explicitly specified
    on Windows platforms.

diff --git a/init-cmake.sh b/init-cmake.sh
index f9b20e8..dcd1154 100755
--- a/init-cmake.sh
+++ b/init-cmake.sh
@@ -37,6 +37,8 @@ subdir=false
 cmake_args=()
 # source directory
 srcdir=..
+# cmake output type (default is platform specific, see below)
+cmake_output=
 
 function add_cmake_args()
 {
@@ -53,7 +55,7 @@ esac
 
 case $platform in
    win*) # for windows, default to VS9
-      add_cmake_args -G "Visual Studio 9 2008"
+      cmake_output="Visual Studio 9 2008"
       ;;
 esac
 
@@ -61,27 +63,27 @@ esac
 while test $# -gt 0; do
    case $1 in
       --vs9)
-         add_cmake_args -G "Visual Studio 9 2008"
+         cmake_output="Visual Studio 9 2008"
          shift
          ;;
       --vs9-64)
-         add_cmake_args -G "Visual Studio 9 2008 Win64"
+         cmake_output="Visual Studio 9 2008 Win64"
          shift
          ;;
       --vs10)
-         add_cmake_args -G "Visual Studio 10"
+         cmake_output="Visual Studio 10"
          shift
          ;;
       --vs10-64)
-         add_cmake_args -G "Visual Studio 10 Win64"
+         cmake_output="Visual Studio 10 Win64"
          shift
          ;;
       --make)
-         add_cmake_args -G "Unix Makefiles"
+         cmake_output="Unix Makefiles"
          shift
          ;;
       --nmake)
-         add_cmake_args -G "Visual Studio 9 2008"
+         cmake_output="Visual Studio 9 2008"
          shift
          ;;
       --subdir)
@@ -107,6 +109,10 @@ while test $# -gt 0; do
    esac
 done
 
+if [ -n "${cmake_output}" ]; then
+    add_cmake_args -G ${cmake_output}
+fi
+
 if ! test -f CMakeLists.txt; then
    echo "CMakeLists.txt missing.  Must be run from a CMake build directory." >&2
    exit 1

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


-- 
asterisk-scf/release/cmake.git