Author: tkreuzer Date: Sat Jan 22 17:13:06 2011 New Revision: 50465
URL: http://svn.reactos.org/svn/reactos?rev=50465&view=rev Log: [CMAKE] - lowerize ARCH string (fixes cmlib) - move definition
Modified: branches/cmake-bringup/CMakeLists.txt
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] Sat Jan 22 17:13:06 2011 @@ -11,6 +11,7 @@ if(NOT ARCH) set(ARCH i386) endif() +string(TOLOWER ${ARCH} ARCH)
# Compile options if(ARCH MATCHES i386) @@ -25,10 +26,10 @@
add_definitions(-DTARGET_${ARCH})
- if(ARCH MATCHES i386) - if(MSVC) - add_definitions(-Dinline=__inline) - endif() + if(MSVC) + add_definitions(-Dinline=__inline) + else() + add_definitions(-fshort-wchar) endif()
include_directories( @@ -38,10 +39,6 @@ include/reactos include/reactos/wine ${REACTOS_BINARY_DIR}/include) - - if(NOT MSVC) - add_definitions(-fshort-wchar) - endif()
add_subdirectory(tools) add_subdirectory(lib)