Index: configure.cmd =================================================================== --- configure.cmd (revision 69745) +++ configure.cmd (working copy) @@ -23,11 +23,11 @@ if /I "%1" == "arm_hosttools" ( echo Configuring x86 host tools for ARM cross build - REM This launches %VSINSTALLDIR%VS\vcvarsall.bat + REM This launches %VSINSTALLDIR%VC\vcvarsall.bat call %2 x86 REM Configure host tools for x86 - cmake -G %3 -DARCH:STRING=i386 %~dp0 + cmake -G %3 -DARCH:STRING=i386 %~dp0 -DNEW_STYLE_BUILD:BOOL=0 exit ) @@ -81,7 +81,9 @@ ) set NEW_STYLE_BUILD=1 - +if "%ARCH%" == "arm" ( + set NEW_STYLE_BUILD=0 +) REM Parse command line parameters :repeat if /I "%1%" == "-DNEW_STYLE_BUILD" ( Index: CMakeLists.txt =================================================================== --- CMakeLists.txt (revision 69745) +++ CMakeLists.txt (working copy) @@ -37,10 +37,6 @@ #set_property(GLOBAL PROPERTY RULE_MESSAGES OFF) set(CMAKE_SKIP_INSTALL_RULES ON) -if(NOT DEFINED NEW_STYLE_BUILD) - set(NEW_STYLE_BUILD TRUE) -endif() - if(NOT ARCH) set(ARCH i386) endif() @@ -51,6 +47,14 @@ # for more information. string(TOLOWER ${ARCH} ARCH) +if(NOT DEFINED NEW_STYLE_BUILD) + if(NOT ARCH STREQUAL "arm") + set(NEW_STYLE_BUILD TRUE) + else() + set(NEW_STYLE_BUILD FALSE) + endif() +endif() + # Compile options if(ARCH STREQUAL "i386") include(cmake/config.cmake)