From 8c95f750643aae6ae4a3cd174b4ecd128809f4ea Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Tue, 28 Dec 2010 11:50:56 +0000 Subject: [PATCH] [CMAKE] - Move the ARCH initialization to the main cmake file instead of the toolchain file. svn path=/branches/cmake-bringup/; revision=50186 --- CMakeLists.txt | 4 ++++ toolchain-mingw32.cmake | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index af2ddb2beda..a4dac6f6c34 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,6 +2,10 @@ cmake_minimum_required(VERSION 2.8) project(REACTOS) +if(NOT ARCH) + set(ARCH i386) +endif() + # Compile options if(ARCH MATCHES i386) include(config.cmake) diff --git a/toolchain-mingw32.cmake b/toolchain-mingw32.cmake index 6eed0060564..e67a34a42cd 100644 --- a/toolchain-mingw32.cmake +++ b/toolchain-mingw32.cmake @@ -1,8 +1,4 @@ -if(NOT ARCH) - set(ARCH i386) -endif() - # Choose the right MinGW prefix if(ARCH MATCHES i386)