[ros-diffs] [spetreolle] 62933: [CMAKE] Set types for variables we pass to cmake. Specifying no type makes them UNINITIALIZED and can cause values to be ignored. See https://www.mail-archive.com/[e-mail]...

Author: spetreolle
Date: Wed Apr 23 18:59:30 2014
New Revision: 62933

URL: http://svn.reactos.org/svn/reactos?rev=62933&view=rev
Log:
[CMAKE]
Set types for variables we pass to cmake.
Specifying no type makes them UNINITIALIZED and can cause values to be ignored.
See https://www.mail-archive.com/[e-mail]/msg17305.html for details.


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

Modified: trunk/reactos/configure.cmd
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/configure.cmd?rev=62933&am…
==============================================================================
--- trunk/reactos/configure.cmd	[iso-8859-1] (original)
+++ trunk/reactos/configure.cmd	[iso-8859-1] Wed Apr 23 18:59:30 2014
@@ -15,7 +15,7 @@
     call %2 x86
 
     :: Configure host tools for x86
-    cmake -G %3 -DARCH=i386 %~dp0
+    cmake -G %3 -DARCH:STRING=i386 %~dp0
     exit
 )
 
@@ -148,7 +148,7 @@
     :: Launch new script instance for x86 host tools configuration
     start "Preparing host tools for ARM cross build..." /I /B /WAIT
%~dp0configure.cmd arm_hosttools "%VSINSTALLDIR%VC\vcvarsall.bat"
%CMAKE_GENERATOR%
 ) else (
-    cmake -G %CMAKE_GENERATOR% -DARCH=%ARCH% "%REACTOS_SOURCE_DIR%"
+    cmake -G %CMAKE_GENERATOR% -DARCH:STRING=%ARCH% "%REACTOS_SOURCE_DIR%"
 )
 
 cd..
@@ -160,11 +160,11 @@
 )
 
 if "%BUILD_ENVIRONMENT%" == "MinGW" (
-    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%"
+    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%"
"%REACTOS_SOURCE_DIR%"
 ) else if "%BUILD_ENVIRONMENT%" == "Clang" (
-    cmake -G %CMAKE_GENERATOR% -DENABLE_CCACHE=0
-DCMAKE_TOOLCHAIN_FILE=toolchain-clang.cmake -DARCH=%ARCH%
-DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%"
"%REACTOS_SOURCE_DIR%"
+    cmake -G %CMAKE_GENERATOR% -DENABLE_CCACHE:BOOL=0
-DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-clang.cmake -DARCH:STRING=%ARCH%
-DREACTOS_BUILD_TOOLS_DIR:PATH="%REACTOS_BUILD_TOOLS_DIR%"
"%REACTOS_SOURCE_DIR%"
 ) else (
-    cmake -G %CMAKE_GENERATOR% -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:FILEPATH=toolchain-msvc.cmake
-DARCH:STRING=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:PATH="%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=62933&…
==============================================================================
--- trunk/reactos/configure.sh	[iso-8859-1] (original)
+++ trunk/reactos/configure.sh	[iso-8859-1] Wed Apr 23 18:59:30 2014
@@ -53,12 +53,12 @@
 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
-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=1
-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...\).