[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  9b8534aeca2b2092b390449f2450cce9828f0572 (commit)
       via  d244d4bd3ef0d5178fd28572b4ea57963300ac44 (commit)
      from  3f25bd27601d0d4befc9a82cc9b1a5e71d58625b (commit)

Summary of changes:
 init-cmake.sh |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)


- Log -----------------------------------------------------------------
commit 9b8534aeca2b2092b390449f2450cce9828f0572
Author: David M. Lee <dlee at digium.com>
Date:   Fri Sep 17 15:52:35 2010 -0600

    Fixed bug on Windows.  Cmake isn't happy with what pwd returns.

diff --git a/init-cmake.sh b/init-cmake.sh
index b720fb3..f9b20e8 100755
--- a/init-cmake.sh
+++ b/init-cmake.sh
@@ -36,7 +36,7 @@ subdir=false
 # extra arguments for cmake
 cmake_args=()
 # source directory
-srcdir=$(pwd)
+srcdir=..
 
 function add_cmake_args()
 {
@@ -114,6 +114,7 @@ fi
 
 if ${subdir}; then
    builddir=./build/${platform}/${build_type}
+   srcdir=../../..
 fi
 
 mkdir -p ${builddir}

commit d244d4bd3ef0d5178fd28572b4ea57963300ac44
Author: David M. Lee <dlee at digium.com>
Date:   Thu Sep 16 16:44:12 2010 -0600

    Fixed init-cmake.sh for Win64 builds.

diff --git a/init-cmake.sh b/init-cmake.sh
index 16787ba..b720fb3 100755
--- a/init-cmake.sh
+++ b/init-cmake.sh
@@ -13,9 +13,9 @@ Usage
 
 Script Options
   --vs9       = Shorthand for -G "Visual Studio 9 2008"
-  --vs9-64    = Shorthand for -G "Visual Studio 9 2008 win64"
+  --vs9-64    = Shorthand for -G "Visual Studio 9 2008 Win64"
   --vs10      = Shorthand for -G "Visual Studio 10"
-  --vs10-64   = Shorthand for -G "Visual Studio 10 win64"
+  --vs10-64   = Shorthand for -G "Visual Studio 10 Win64"
   --make      = Shorthand for -G "Unix Makefiles"
   --nmake     = Shorthand for -G "NMake Makefiles"
   --subdir    = Build in ./build/${platform}/\${type} instead of ./build
@@ -65,7 +65,7 @@ while test $# -gt 0; do
          shift
          ;;
       --vs9-64)
-         add_cmake_args -G "Visual Studio 9 2008 win64"
+         add_cmake_args -G "Visual Studio 9 2008 Win64"
          shift
          ;;
       --vs10)
@@ -73,7 +73,7 @@ while test $# -gt 0; do
          shift
          ;;
       --vs10-64)
-         add_cmake_args -G "Visual Studio 10 win64"
+         add_cmake_args -G "Visual Studio 10 Win64"
          shift
          ;;
       --make)

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


-- 
asterisk-scf/release/cmake.git