diff --git a/StepmaniaCore.cmake b/StepmaniaCore.cmake
index d40280ff06..c8acdf7618 100644
--- a/StepmaniaCore.cmake
+++ b/StepmaniaCore.cmake
@@ -153,10 +153,12 @@ check_type_size(pid_t SIZEOF_PID_T)
 check_type_size(size_t SIZEOF_SIZE_T)
 check_type_size(ssize_t SIZEOF_SSIZE_T)
 
-if(WIN32 AND SIZEOF_INTPTR_T EQUAL 8)
-  set(SM_WIN32_ARCH "x64")
-else()
-  set(SM_WIN32_ARCH "x86")
+if(WIN32)
+  if(SIZEOF_INTPTR_T EQUAL 8)
+    set(SM_WIN32_ARCH "x64")
+  else()
+    set(SM_WIN32_ARCH "x86")
+  endif()
 endif()
 
 include(TestBigEndian)
diff --git a/extern/CMakeProject-mad.cmake b/extern/CMakeProject-mad.cmake
index dccb8d575c..34277ef93a 100644
--- a/extern/CMakeProject-mad.cmake
+++ b/extern/CMakeProject-mad.cmake
@@ -62,7 +62,7 @@ else()
     # first glance.
     sm_add_compile_definition("mad" ASO_ZEROCHECK)
     sm_add_compile_definition("mad" $<$<CONFIG:Debug>:FPM_DEFAULT>)
-    if(SM_WIN32_ARCH EQUAL "x64")
+    if(SM_WIN32_ARCH MATCHES "x64")
       sm_add_compile_definition("mad" $<$<CONFIG:Release>:FPM_64BIT>)
       sm_add_compile_definition("mad" $<$<CONFIG:MinSizeRel>:FPM_64BIT>)
       sm_add_compile_definition("mad" $<$<CONFIG:RelWithDebInfo>:FPM_64BIT>)
diff --git a/src/CMakeData-os.cmake b/src/CMakeData-os.cmake
index 0e39e1f17a..8706c11cdb 100644
--- a/src/CMakeData-os.cmake
+++ b/src/CMakeData-os.cmake
@@ -57,7 +57,7 @@ else()
                 "archutils/Win32/WindowsDialogBox.cpp"
                 "archutils/Win32/WindowsResources.rc")
 
-    if(MSVC AND SM_WIN32_ARCH EQUAL "x64")
+    if(MSVC AND SM_WIN32_ARCH MATCHES "x64")
       enable_language(ASM_MASM)
       list(APPEND SMDATA_OS_SRC "archutils/Win32/ExceptionHandler_x64.asm")
     endif()
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 735c0b7775..105b901f3d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -135,8 +135,10 @@ sm_add_compile_definition("${SM_EXE_NAME}"
 set(SM_COMPILE_FLAGS "")
 
 if(WITH_SSE2)
-  if(MSVC AND SM_WIN32_ARCH EQUAL "x86")
-    set(SM_COMPILE_FLAGS "${SM_COMPILE_FLAGS} /arch:SSE2")
+  if(MSVC)
+    if(SM_WIN32_ARCH MATCHES "x86")
+      set(SM_COMPILE_FLAGS "${SM_COMPILE_FLAGS} /arch:SSE2")
+    endif()
   else()
     set(SM_COMPILE_FLAGS "${SM_COMPILE_FLAGS} -msse2")
   endif()