Author: akhaldi Date: Sat Sep 1 11:35:12 2012 New Revision: 57210
URL: http://svn.reactos.org/svn/reactos?rev=57210&view=rev Log: [CMAKE] * Addendum to r57181. By Hermès Bélusca.
Modified: trunk/rostests/apitests/CMakeLists.txt trunk/rostests/apitests/crt/crtdll_crt_apitest.cmake trunk/rostests/apitests/crt/msvcrt_crt_apitest.cmake trunk/rostests/apitests/crt/ntdll_crt_apitest.cmake trunk/rostests/apitests/ntdll/CMakeLists.txt
Modified: trunk/rostests/apitests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/CMakeLists.txt?re... ============================================================================== --- trunk/rostests/apitests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/CMakeLists.txt [iso-8859-1] Sat Sep 1 11:35:12 2012 @@ -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()
Modified: trunk/rostests/apitests/crt/crtdll_crt_apitest.cmake URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/crtdll_crt_ap... ============================================================================== --- trunk/rostests/apitests/crt/crtdll_crt_apitest.cmake [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/crtdll_crt_apitest.cmake [iso-8859-1] Sat Sep 1 11:35:12 2012 @@ -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
Modified: trunk/rostests/apitests/crt/msvcrt_crt_apitest.cmake URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/msvcrt_crt_ap... ============================================================================== --- trunk/rostests/apitests/crt/msvcrt_crt_apitest.cmake [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/msvcrt_crt_apitest.cmake [iso-8859-1] Sat Sep 1 11:35:12 2012 @@ -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
Modified: trunk/rostests/apitests/crt/ntdll_crt_apitest.cmake URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/ntdll_crt_api... ============================================================================== --- trunk/rostests/apitests/crt/ntdll_crt_apitest.cmake [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/ntdll_crt_apitest.cmake [iso-8859-1] Sat Sep 1 11:35:12 2012 @@ -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
Modified: trunk/rostests/apitests/ntdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/CMakeLists.... ============================================================================== --- trunk/rostests/apitests/ntdll/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/CMakeLists.txt [iso-8859-1] Sat Sep 1 11:35:12 2012 @@ -16,7 +16,7 @@ ZwContinue.c testlist.c)
-if(ARCH MATCHES i386) +if(ARCH STREQUAL "i386") list(APPEND SOURCE i386/ZwContinue.S) endif()