Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 10:04:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CONFIGURE]

Browse source 
Addendum to r69601:
host-tools are "no longer required" but actually still exist.
Add the CMakeCache cleanup for them.


svn path=/trunk/; revision=71204
This commit is contained in:
Sylvain Petreolle 2016-04-24 22:40:53 +00:00
parent a5f9846eb9
commit 4a708c0f30
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
reactos/configure.cmd
View file

@ -214,6 +214,7 @@ if "%NEW_STYLE_BUILD%"=="0" (
if EXIST CMakeCache.txt ( if EXIST CMakeCache.txt (
del CMakeCache.txt /q del CMakeCache.txt /q
del host-tools\CMakeCache.txt /q
) )
if "%NEW_STYLE_BUILD%"=="0" ( if "%NEW_STYLE_BUILD%"=="0" (

6
reactos/configure.sh
View file

@ -52,7 +52,7 @@ fi
mkdir -p reactos mkdir -p reactos
EXTRA_ARGS="" #EXTRA_ARGS=""
if [ $USE_NEW_STYLE -eq 0 ]; then if [ $USE_NEW_STYLE -eq 0 ]; then
mkdir -p host-tools mkdir -p host-tools
echo Preparing host tools... echo Preparing host tools...
@ -62,14 +62,14 @@ if [ $USE_NEW_STYLE -eq 0 ]; then
REACTOS_BUILD_TOOLS_DIR="$PWD" REACTOS_BUILD_TOOLS_DIR="$PWD"
cmake -G "$CMAKE_GENERATOR" -DARCH:STRING=$ARCH $ROS_CMAKEOPTS -DNEW_STYLE_BUILD:BOOL=0 "$REACTOS_SOURCE_DIR" cmake -G "$CMAKE_GENERATOR" -DARCH:STRING=$ARCH $ROS_CMAKEOPTS -DNEW_STYLE_BUILD:BOOL=0 "$REACTOS_SOURCE_DIR"
EXTRA_ARGS="-DREACTOS_BUILD_TOOLS_DIR:PATH=$REACTOS_BUILD_TOOLS_DIR" EXTRA_ARGS="$EXTRA_ARGS -DREACTOS_BUILD_TOOLS_DIR:PATH=$REACTOS_BUILD_TOOLS_DIR"
cd .. cd ..
fi fi
echo Preparing reactos... echo Preparing reactos...
cd reactos cd reactos
rm -f CMakeCache.txt rm -f CMakeCache.txt host-tools/CMakeCache.txt
cmake -G "$CMAKE_GENERATOR" -DENABLE_CCACHE:BOOL=0 -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-gcc.cmake -DARCH:STRING=$ARCH -DNEW_STYLE_BUILD:BOOL=$USE_NEW_STYLE $EXTRA_ARGS $ROS_CMAKEOPTS "$REACTOS_SOURCE_DIR" cmake -G "$CMAKE_GENERATOR" -DENABLE_CCACHE:BOOL=0 -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-gcc.cmake -DARCH:STRING=$ARCH -DNEW_STYLE_BUILD:BOOL=$USE_NEW_STYLE $EXTRA_ARGS $ROS_CMAKEOPTS "$REACTOS_SOURCE_DIR"