Index: apitests/CMakeLists.txt
===================================================================
--- apitests/CMakeLists.txt	(révision 57209)
+++ apitests/CMakeLists.txt	(copie de travail)
@@ -10,7 +10,7 @@
 add_subdirectory(ntdll)
 add_subdirectory(powrprof)
 add_subdirectory(user32)
-if(NOT MSVC AND ARCH MATCHES i386)
+if(NOT MSVC AND ARCH STREQUAL "i386")
     add_subdirectory(w32kdll)
     add_subdirectory(w32knapi)
 endif()
Index: apitests/crt/crtdll_crt_apitest.cmake
===================================================================
--- apitests/crt/crtdll_crt_apitest.cmake	(révision 57209)
+++ apitests/crt/crtdll_crt_apitest.cmake	(copie de travail)
@@ -525,7 +525,7 @@
 #    wscanf.c
 )
 
-if (ARCH MATCHES i386)
+if(ARCH STREQUAL "i386")
     list(APPEND SOURCE_CRTDLL
     #    _CIpow.c
     #    _ftol.c
@@ -542,7 +542,7 @@
     #    _aullshr.c
     #    _chkstk.c
     )
-elseif (ARCH MATCHES amd64)
+elseif(ARCH STREQUAL "amd64")
     list(APPEND SOURCE_CRTDLL
     #    __C_specific_handler
     #    _setjmp.c
Index: apitests/crt/msvcrt_crt_apitest.cmake
===================================================================
--- apitests/crt/msvcrt_crt_apitest.cmake	(révision 57209)
+++ apitests/crt/msvcrt_crt_apitest.cmake	(copie de travail)
@@ -1263,7 +1263,7 @@
 #    wscanf_s.c
 )
 
-if (ARCH MATCHES i386)
+if(ARCH STREQUAL "i386")
     list(APPEND SOURCE_MSVCRT
     #    _CIacos.c
     #    _CIasin.c
@@ -1350,7 +1350,7 @@
     #    _seh_longjmp_unwind.c
     #    -norelay _setjmp3.c
     )
-elseif (ARCH MATCHES amd64)
+elseif(ARCH STREQUAL "amd64")
     list(APPEND SOURCE_MSVCRT
     #    __C_specific_handler
     #    _setjmp.c
Index: apitests/crt/ntdll_crt_apitest.cmake
===================================================================
--- apitests/crt/ntdll_crt_apitest.cmake	(révision 57209)
+++ apitests/crt/ntdll_crt_apitest.cmake	(copie de travail)
@@ -124,7 +124,7 @@
 #    wcstoul.c
 )
 
-if (ARCH MATCHES i386)
+if(ARCH STREQUAL "i386")
     list(APPEND SOURCE_NTDLL
     #    _CIpow.c
     #    _ftol.c
@@ -141,7 +141,7 @@
     #    _aullshr.c
     #    _chkstk.c
     )
-elseif (ARCH MATCHES amd64)
+elseif(ARCH STREQUAL "amd64")
     list(APPEND SOURCE_NTDLL
     #    __C_specific_handler
     #    _setjmp.c
Index: apitests/ntdll/CMakeLists.txt
===================================================================
--- apitests/ntdll/CMakeLists.txt	(révision 57209)
+++ apitests/ntdll/CMakeLists.txt	(copie de travail)
@@ -16,7 +16,7 @@
     ZwContinue.c
     testlist.c)
 
-if(ARCH MATCHES i386)
+if(ARCH STREQUAL "i386")
     list(APPEND SOURCE i386/ZwContinue.S)
 endif()