diff --git a/BLOSC/config/zlib-CMakeLists.txt b/BLOSC/config/zlib-CMakeLists.txt
index b8772fb8..a7cb3f10 100644
--- a/BLOSC/config/zlib-CMakeLists.txt
+++ b/BLOSC/config/zlib-CMakeLists.txt
@@ -148,9 +148,13 @@ endif(MINGW)
 
 ### Define library
 add_library(zlibstat STATIC ${ZLIB_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
-if (MSVC AND CMAKE_CL_64)
-  set_target_properties (zlibstat PROPERTIES STATIC_LIBRARY_FLAGS "/machine:x64")
-endif ()
+if (MSVC AND CMAKE_SIZEOF_VOID_P EQUAL 8)
+  if (CMAKE_C_COMPILER_ARCHITECTURE_ID MATCHES "ARM64")
+    set_target_properties(${ZLIB_LIB_TARGET} PROPERTIES STATIC_LIBRARY_FLAGS "/machine:ARM64")
+  else()
+    set_target_properties(${ZLIB_LIB_TARGET} PROPERTIES STATIC_LIBRARY_FLAGS "/machine:x64")
+  endif()
+endif()
 set_target_properties(zlibstat PROPERTIES
     PUBLIC_HEADER ""
     LINKER_LANGUAGE C
diff --git a/LZF/config/CMakeLists.txt b/LZF/config/CMakeLists.txt
index d5d87919..732b3f7e 100644
--- a/LZF/config/CMakeLists.txt
+++ b/LZF/config/CMakeLists.txt
@@ -146,9 +146,13 @@ set (LZF_SRCS
 
 add_library (${LZF_LIB_TARGET} STATIC ${LZF_SRCS} ${LZF_HDRS} ${LZF_PUBLIC_HEADERS})
 
-if (MSVC AND CMAKE_CL_64)
-  set_target_properties (${LZF_LIB_TARGET} PROPERTIES STATIC_LIBRARY_FLAGS "/machine:x64")
-endif ()
+if (MSVC AND CMAKE_SIZEOF_VOID_P EQUAL 8)
+  if (CMAKE_C_COMPILER_ARCHITECTURE_ID MATCHES "ARM64")
+    set_target_properties(${ZLIB_LIB_TARGET} PROPERTIES STATIC_LIBRARY_FLAGS "/machine:ARM64")
+  else()
+    set_target_properties(${ZLIB_LIB_TARGET} PROPERTIES STATIC_LIBRARY_FLAGS "/machine:x64")
+  endif()
+endif()
 TARGET_C_PROPERTIES (${LZF_LIB_TARGET} STATIC)
 target_link_libraries (${LZF_LIB_TARGET} ${H5PL_LINK_LIBS})
 HDF_IMPORT_SET_LIB_OPTIONS (${LZF_LIB_TARGET} ${LZF_LIB_NAME} STATIC "")