diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f0a7b26b..a90ec6b6 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -214,12 +214,15 @@ elseif( CMAKE_COMPILER_IS_GNUCXX )
 		add_definitions( "/D_DEBUG" )
 	endif( )
 
-	if( BUILD64 )
-		set( CMAKE_CXX_FLAGS "-m64 ${CMAKE_CXX_FLAGS}" )
-		set( CMAKE_C_FLAGS "-m64 ${CMAKE_C_FLAGS}" )
-	else( )
-		set( CMAKE_CXX_FLAGS "-m32 ${CMAKE_CXX_FLAGS}" )
-		set( CMAKE_C_FLAGS "-m32 ${CMAKE_C_FLAGS}" )
+	# For x86/amd64 architectures, set 32/64 bit flags
+	if( CMAKE_SYSTEM_PROCESSOR MATCHES "x86|i.86|AMD64" )
+		if( BUILD64 )
+			set( CMAKE_CXX_FLAGS "-m64 ${CMAKE_CXX_FLAGS}" )
+			set( CMAKE_C_FLAGS "-m64 ${CMAKE_C_FLAGS}" )
+		else( )
+			set( CMAKE_CXX_FLAGS "-m32 ${CMAKE_CXX_FLAGS}" )
+			set( CMAKE_C_FLAGS "-m32 ${CMAKE_C_FLAGS}" )
+		endif( )
 	endif( )
 
 	if( CODE_COVERAGE )