Fix OS/ARCH match

Author: lmangani

CMakeLists.txt

@@ -15,14 +15,12 @@ message(STATUS "Detected architecture: ${SYSTEM_ARCH}")
 set(WVLET_STATIC_URL "")
 set(WVLET_DYNAMIC_URL "")
 if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-#    # if(SYSTEM_ARCH MATCHES ".*(amd64|x86_64).*" )
-    if(VCPKG_TARGET_TRIPLET MATCHES "x64-linux")
+    if(VCPKG_TARGET_TRIPLET MATCHES "x64-linux" OR SYSTEM_ARCH MATCHES ".*(amd64|x86_64).*")
         set(WVLET_STATIC_URL "https://github.com/quackscience/wvlet-lib/releases/download/latest/linux-x64_libwvlet.a")
         set(WVLET_STATIC_PATH "${CMAKE_CURRENT_SOURCE_DIR}/third-party/linux-x64_libwvlet.a")
         set(WVLET_DYNAMIC_URL "https://github.com/quackscience/wvlet-lib/releases/download/latest/linux-x64_libwvlet.so")
         set(WVLET_DYNAMIC_PATH "${CMAKE_CURRENT_SOURCE_DIR}/third-party/linux-x64_libwvlet.so")
-#    # elseif(SYSTEM_ARCH MATCHES ".*(arm64|aarch64).*")
-    elseif(VCPKG_TARGET_TRIPLET MATCHES "arm64-linux")
+    elseif(VCPKG_TARGET_TRIPLET MATCHES "arm64-linux" OR SYSTEM_ARCH MATCHES ".*(arm64|aarch64).*")
         set(WVLET_STATIC_URL "https://github.com/quackscience/wvlet-lib/releases/download/latest/linux-arm64_libwvlet.a")
         set(WVLET_STATIC_PATH "${CMAKE_CURRENT_SOURCE_DIR}/third-party/linux-arm64_libwvlet.a")
         set(WVLET_DYNAMIC_URL "https://github.com/quackscience/wvlet-lib/releases/download/latest/linux-arm64_libwvlet.so")