Sync with trunk revision 64099.

[reactos.git] / configure.sh

diff --git a/configure.sh b/configure.sh
index e8595b7..be49ba4 100755 (executable)
--- a/configure.sh
+++ b/configure.sh
@@ -21,14 +21,14 @@ while [ $# -gt 0 ]; do
                -D)
                        shift
                        if echo "x$1" | grep 'x?*=*' > /dev/null; then
-                               ROS_CMAKEOPTS+=" -D $1"
+                               ROS_CMAKEOPTS=$ROS_CMAKEOPTS" -D $1"
                        else
                                usage
                        fi
                ;;
 
                -D?*=*|-D?*)
-                       ROS_CMAKEOPTS+=" $1"
+                       ROS_CMAKEOPTS=$ROS_CMAKEOPTS" $1"
                ;;
                makefiles|Makefiles)
                        CMAKE_GENERATOR="Unix Makefiles"
@@ -53,12 +53,12 @@ cd host-tools
 rm -f CMakeCache.txt
 
 REACTOS_BUILD_TOOLS_DIR="$PWD"
-cmake -G "$CMAKE_GENERATOR" -DARCH=$ARCH $ROS_CMAKEOPTS "$REACTOS_SOURCE_DIR"
+cmake -G "$CMAKE_GENERATOR" -DARCH:STRING=$ARCH $ROS_CMAKEOPTS "$REACTOS_SOURCE_DIR"
 
 echo Preparing reactos...
 cd ../reactos
 rm -f CMakeCache.txt
 
-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" $ROS_CMAKEOPTS "$REACTOS_SOURCE_DIR"
+cmake -G "$CMAKE_GENERATOR" -DENABLE_CCACHE:BOOL=0 -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-gcc.cmake -DARCH:STRING=$ARCH -DREACTOS_BUILD_TOOLS_DIR:PATH="$REACTOS_BUILD_TOOLS_DIR" $ROS_CMAKEOPTS "$REACTOS_SOURCE_DIR"
 
 echo Configure script complete! Enter directories and execute appropriate build commands \(ex: ninja, make, makex, etc...\).