diff --git a/cmake/cmake.platform b/cmake/cmake.platform
index cb09bf2085..f9faf7316c 100644
--- a/cmake/cmake.platform
+++ b/cmake/cmake.platform
@@ -56,9 +56,17 @@ IF (${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "Darwin
 
         SET(TD_DARWIN TRUE)
         SET(OSTYPE "macOS")
+        execute_process(COMMAND geos-config --cflags OUTPUT_VARIABLE GEOS_CFLAGS)
+        execute_process(COMMAND geos-config --ldflags OUTPUT_VARIABLE GEOS_LDFLAGS)
+        string(SUBSTRING ${GEOS_CFLAGS} 2 -1 GEOS_CFLAGS)
+        string(REGEX REPLACE "\n" "" GEOS_CFLAGS ${GEOS_CFLAGS})
+        string(SUBSTRING ${GEOS_LDFLAGS} 2 -1 GEOS_LDFLAGS)
+        string(REGEX REPLACE "\n" "" GEOS_LDFLAGS ${GEOS_LDFLAGS})
+        MESSAGE("GEOS_CFLAGS "${GEOS_CFLAGS})
+        MESSAGE("GEOS_LDFLAGS "${GEOS_LDFLAGS})
         ADD_DEFINITIONS("-DDARWIN -Wno-tautological-pointer-compare")
-        INCLUDE_DIRECTORIES(/usr/local/include)
-        LINK_DIRECTORIES(/usr/local/lib)
+        INCLUDE_DIRECTORIES(${GEOS_CFLAGS})
+        LINK_DIRECTORIES(${GEOS_LDFLAGS})
 
         IF (${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm64")
             MESSAGE("Current system arch is arm64")
diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt
index b3333dee99..eeb20ee884 100644
--- a/contrib/CMakeLists.txt
+++ b/contrib/CMakeLists.txt
@@ -236,6 +236,10 @@ if(${BUILD_WITH_ROCKSDB})
         SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=maybe-uninitialized")
     endif(${TD_DARWIN})
 
+    if (${TD_DARWIN_ARM64})
+        set(HAS_ARMV8_CRC true)
+    endif(${TD_DARWIN_ARM64})
+
     if (${TD_WINDOWS})
         SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4244 /wd4819")  
     endif(${TD_WINDOWS})