[ros-diffs] [akhaldi] 62151: [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

Author: akhaldi
Date: Thu Feb 13 21:42:05 2014
New Revision: 62151

URL: http://svn.reactos.org/svn/reactos?rev=62151&view=rev
Log:
[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

Modified:
    trunk/reactos/CMakeLists.txt
    trunk/reactos/configure.cmd
    trunk/reactos/configure.sh

Modified: trunk/reactos/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/CMakeLists.txt?rev=62151&a…
==============================================================================
--- trunk/reactos/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/CMakeLists.txt	[iso-8859-1] Thu Feb 13 21:42:05 2014
@@ -132,6 +132,12 @@
 
     if(_WINKD_)
         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

Modified: trunk/reactos/configure.cmd
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/configure.cmd?rev=62151&am…
==============================================================================
--- trunk/reactos/configure.cmd	[iso-8859-1] (original)
+++ trunk/reactos/configure.cmd	[iso-8859-1] Thu Feb 13 21:42:05 2014
@@ -150,9 +150,9 @@
 )
 
 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..

Modified: trunk/reactos/configure.sh
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/configure.sh?rev=62151&…
==============================================================================
--- trunk/reactos/configure.sh	[iso-8859-1] (original)
+++ trunk/reactos/configure.sh	[iso-8859-1] Thu Feb 13 21:42:05 2014
@@ -59,6 +59,6 @@
 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...\).