Revert "build: add a shim for older CMake (#1664)" (#1690)

Author: jamieQ

CMakeLists.txt

@@ -24,15 +24,8 @@ set(SWT_SOURCE_ROOT_DIR ${CMAKE_SOURCE_DIR})
 project(SwiftTesting
   LANGUAGES CXX Swift)
 
-if(CMAKE_VERSION VERSION_LESS 3.31)
-  if(CMAKE_SYSTEM_NAME STREQUAL "Generic" AND CMAKE_SYSTEM_PROCESSOR MATCHES "wasm32")
-    set(CMAKE_SYSTEM_NAME WASI)
-    set(WASI 1)
-  endif()
-endif()
-
 if(NOT APPLE)
-  if(NOT WASI)
+  if(NOT CMAKE_SYSTEM_NAME STREQUAL WASI)
     find_package(dispatch CONFIG)
   endif()
   find_package(Foundation CONFIG)

cmake/modules/shared/CompilerSettings.cmake

@@ -42,7 +42,7 @@ if(NOT APPLE)
   add_compile_definitions("SWT_NO_SNAPSHOT_TYPES")
   add_compile_definitions("SWT_NO_FOUNDATION_FILE_COORDINATION")
 endif()
-if(WASI)
+if(CMAKE_SYSTEM_NAME STREQUAL "WASI")
   add_compile_definitions("SWT_NO_DYNAMIC_LINKING")
   add_compile_definitions("SWT_NO_PIPES")
 endif()
@@ -60,7 +60,7 @@ if(SWT_TESTING_LIBRARY_VERSION)
   add_compile_definitions("$<$<COMPILE_LANGUAGE:CXX>:SWT_TESTING_LIBRARY_VERSION=\"${SWT_TESTING_LIBRARY_VERSION}\">")
 endif()
 
-if((NOT BUILD_SHARED_LIBS) AND NOT WASI)
+if((NOT BUILD_SHARED_LIBS) AND (NOT CMAKE_SYSTEM_NAME STREQUAL WASI))
   # When building a static library, Interop is not supported at this time
   add_compile_definitions("SWT_NO_INTEROP")
 endif()