[ros-diffs] [jgardou] 57614: [CONFIGURE_SH] - Add the ability to use the ninja generator with unix configure script

Author: jgardou
Date: Thu Oct 25 13:05:30 2012
New Revision: 57614

URL: http://svn.reactos.org/svn/reactos?rev=57614&view=rev
Log:
[CONFIGURE_SH]
- Add the ability to use the ninja generator with unix configure script

Modified:
    trunk/reactos/configure.sh

Modified: trunk/reactos/configure.sh
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/configure.sh?rev=57614&…
==============================================================================
--- trunk/reactos/configure.sh [iso-8859-1] (original)
+++ trunk/reactos/configure.sh [iso-8859-1] Thu Oct 25 13:05:30 2012
@@ -9,6 +9,11 @@
 ARCH=$ROS_ARCH
 REACTOS_SOURCE_DIR=$(cd `dirname $0` && pwd)
 REACTOS_OUTPUT_PATH=output-$BUILD_ENVIRONMENT-$ARCH
+if [ "$1" = "ninja" ]; then
+CMAKE_GENERATOR="Ninja"
+else
+CMAKE_GENERATOR="Unix Makefiles"
+fi
 
 if [ "$REACTOS_SOURCE_DIR" = "$PWD" ]; then
   echo Creating directories in $REACTOS_OUTPUT_PATH
@@ -23,12 +28,12 @@
 rm -f CMakeCache.txt
 
 REACTOS_BUILD_TOOLS_DIR="$PWD"
-cmake -G "Unix Makefiles" -DARCH=$ARCH "$REACTOS_SOURCE_DIR"
+cmake -G "$CMAKE_GENERATOR" -DARCH=$ARCH "$REACTOS_SOURCE_DIR"
 
 echo Preparing reactos...
 cd ../reactos
 rm -f CMakeCache.txt
 
-cmake -G "Unix Makefiles" -DENABLE_CCACHE=0 -DPCH=0
-DCMAKE_TOOLCHAIN_FILE=toolchain-gcc.cmake -DARCH=$ARCH
-DREACTOS_BUILD_TOOLS_DIR="$REACTOS_BUILD_TOOLS_DIR"
"$REACTOS_SOURCE_DIR"
+cmake -G "$CMAKE_GENERATOR" -DENABLE_CCACHE=0 -DPCH=0
-DCMAKE_TOOLCHAIN_FILE=toolchain-gcc.cmake -DARCH=$ARCH
-DREACTOS_BUILD_TOOLS_DIR="$REACTOS_BUILD_TOOLS_DIR"
"$REACTOS_SOURCE_DIR"
 
 echo Configure script complete! Enter directories and execute appropriate build
commands\(ex: make, makex, etc...\).