From 83164605f50c1730380deedd5339caebdf9f8209 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Thu, 13 Feb 2014 21:42:05 +0000 Subject: [PATCH] [CMAKE] * Set PCH as on by default for RosBE 2.1.1 users. * You guys no longer need to alter anything now, just grab RosBE 2.1.1 and have fun ;) CORE-7716 svn path=/trunk/; revision=62151 --- reactos/CMakeLists.txt | 6 ++++++ reactos/configure.cmd | 4 ++-- reactos/configure.sh | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/reactos/CMakeLists.txt b/reactos/CMakeLists.txt index 2518f378d2c..0528ac94ab2 100644 --- a/reactos/CMakeLists.txt +++ b/reactos/CMakeLists.txt @@ -134,6 +134,12 @@ else() add_definitions(-D_WINKD_=1) endif() + if(CMAKE_VERSION STREQUAL "2.8.12.1-ReactOS") + set(PCH 1) + else() + set(PCH 0) + endif() + # Version Options add_definitions(-DWINVER=0x502 -D_WIN32_IE=0x600 diff --git a/reactos/configure.cmd b/reactos/configure.cmd index 8f5e9707d6b..bca5d02fe71 100755 --- a/reactos/configure.cmd +++ b/reactos/configure.cmd @@ -150,9 +150,9 @@ if EXIST CMakeCache.txt ( ) if "%BUILD_ENVIRONMENT%" == "MinGW" ( - cmake -G %CMAKE_GENERATOR% -DENABLE_CCACHE=0 -DPCH=0 -DCMAKE_TOOLCHAIN_FILE=toolchain-gcc.cmake -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" "%REACTOS_SOURCE_DIR%" + cmake -G %CMAKE_GENERATOR% -DENABLE_CCACHE=0 -DCMAKE_TOOLCHAIN_FILE=toolchain-gcc.cmake -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" "%REACTOS_SOURCE_DIR%" ) else ( - cmake -G %CMAKE_GENERATOR% -DPCH=0 -DCMAKE_TOOLCHAIN_FILE=toolchain-msvc.cmake -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" "%REACTOS_SOURCE_DIR%" + cmake -G %CMAKE_GENERATOR% -DCMAKE_TOOLCHAIN_FILE=toolchain-msvc.cmake -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" "%REACTOS_SOURCE_DIR%" ) cd.. diff --git a/reactos/configure.sh b/reactos/configure.sh index 8893d4e9390..3f7485df786 100755 --- a/reactos/configure.sh +++ b/reactos/configure.sh @@ -59,6 +59,6 @@ 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=0 -DCMAKE_TOOLCHAIN_FILE=toolchain-gcc.cmake -DARCH=$ARCH -DREACTOS_BUILD_TOOLS_DIR="$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...\).