From cd70b62ce1cd46e044695811e30833b1216398af Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sat, 1 Sep 2012 11:35:12 +0000 Subject: [PATCH] =?utf8?q?[CMAKE]=20*=20Addendum=20to=20r57181.=20By=20Her?= =?utf8?q?m=C3=A8s=20B=C3=A9lusca.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit svn path=/trunk/; revision=57210 --- rostests/apitests/CMakeLists.txt | 2 +- rostests/apitests/crt/crtdll_crt_apitest.cmake | 4 ++-- rostests/apitests/crt/msvcrt_crt_apitest.cmake | 4 ++-- rostests/apitests/crt/ntdll_crt_apitest.cmake | 4 ++-- rostests/apitests/ntdll/CMakeLists.txt | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/rostests/apitests/CMakeLists.txt b/rostests/apitests/CMakeLists.txt index d89a3e29c93..20bcaaf434e 100644 --- a/rostests/apitests/CMakeLists.txt +++ b/rostests/apitests/CMakeLists.txt @@ -10,7 +10,7 @@ add_subdirectory(msvcrt) 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() diff --git a/rostests/apitests/crt/crtdll_crt_apitest.cmake b/rostests/apitests/crt/crtdll_crt_apitest.cmake index d8b8571f7a5..61f2af57e8e 100644 --- a/rostests/apitests/crt/crtdll_crt_apitest.cmake +++ b/rostests/apitests/crt/crtdll_crt_apitest.cmake @@ -525,7 +525,7 @@ list(APPEND SOURCE_CRTDLL # wscanf.c ) -if (ARCH MATCHES i386) +if(ARCH STREQUAL "i386") list(APPEND SOURCE_CRTDLL # _CIpow.c # _ftol.c @@ -542,7 +542,7 @@ if (ARCH MATCHES i386) # _aullshr.c # _chkstk.c ) -elseif (ARCH MATCHES amd64) +elseif(ARCH STREQUAL "amd64") list(APPEND SOURCE_CRTDLL # __C_specific_handler # _setjmp.c diff --git a/rostests/apitests/crt/msvcrt_crt_apitest.cmake b/rostests/apitests/crt/msvcrt_crt_apitest.cmake index 3bf1d6ebe1a..04880a3eb52 100644 --- a/rostests/apitests/crt/msvcrt_crt_apitest.cmake +++ b/rostests/apitests/crt/msvcrt_crt_apitest.cmake @@ -1263,7 +1263,7 @@ list(APPEND SOURCE_MSVCRT # wscanf_s.c ) -if (ARCH MATCHES i386) +if(ARCH STREQUAL "i386") list(APPEND SOURCE_MSVCRT # _CIacos.c # _CIasin.c @@ -1350,7 +1350,7 @@ if (ARCH MATCHES i386) # _seh_longjmp_unwind.c # -norelay _setjmp3.c ) -elseif (ARCH MATCHES amd64) +elseif(ARCH STREQUAL "amd64") list(APPEND SOURCE_MSVCRT # __C_specific_handler # _setjmp.c diff --git a/rostests/apitests/crt/ntdll_crt_apitest.cmake b/rostests/apitests/crt/ntdll_crt_apitest.cmake index 74509517af2..63a51d1f908 100644 --- a/rostests/apitests/crt/ntdll_crt_apitest.cmake +++ b/rostests/apitests/crt/ntdll_crt_apitest.cmake @@ -124,7 +124,7 @@ list(APPEND SOURCE_NTDLL # wcstoul.c ) -if (ARCH MATCHES i386) +if(ARCH STREQUAL "i386") list(APPEND SOURCE_NTDLL # _CIpow.c # _ftol.c @@ -141,7 +141,7 @@ if (ARCH MATCHES i386) # _aullshr.c # _chkstk.c ) -elseif (ARCH MATCHES amd64) +elseif(ARCH STREQUAL "amd64") list(APPEND SOURCE_NTDLL # __C_specific_handler # _setjmp.c diff --git a/rostests/apitests/ntdll/CMakeLists.txt b/rostests/apitests/ntdll/CMakeLists.txt index c13df849659..3dabc3a267f 100644 --- a/rostests/apitests/ntdll/CMakeLists.txt +++ b/rostests/apitests/ntdll/CMakeLists.txt @@ -16,7 +16,7 @@ list(APPEND SOURCE ZwContinue.c testlist.c) -if(ARCH MATCHES i386) +if(ARCH STREQUAL "i386") list(APPEND SOURCE i386/ZwContinue.S) endif() -- 2.17.1