Author: akhaldi Date: Tue Dec 28 11:50:56 2010 New Revision: 50186
URL: http://svn.reactos.org/svn/reactos?rev=50186&view=rev Log: [CMAKE] - Move the ARCH initialization to the main cmake file instead of the toolchain file.
Modified: branches/cmake-bringup/CMakeLists.txt branches/cmake-bringup/toolchain-mingw32.cmake
Modified: branches/cmake-bringup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/CMakeLists.txt?rev... ============================================================================== --- branches/cmake-bringup/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/CMakeLists.txt [iso-8859-1] Tue Dec 28 11:50:56 2010 @@ -1,6 +1,10 @@
cmake_minimum_required(VERSION 2.8) project(REACTOS) + +if(NOT ARCH) + set(ARCH i386) +endif()
# Compile options if(ARCH MATCHES i386)
Modified: branches/cmake-bringup/toolchain-mingw32.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/toolchain-mingw32.... ============================================================================== --- branches/cmake-bringup/toolchain-mingw32.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/toolchain-mingw32.cmake [iso-8859-1] Tue Dec 28 11:50:56 2010 @@ -1,7 +1,3 @@ - -if(NOT ARCH) - set(ARCH i386) -endif()
# Choose the right MinGW prefix if(ARCH MATCHES i386)