diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3faf54f..410b204 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,15 +9,15 @@ option(TIM_VX_USE_EXTERNAL_OVXLIB   "Use external OVXLIB"                   OFF)
 set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 set(CMAKE_CXX_FLAGS "-Wall -Wextra -Werror")
+set(CONFIG "" CACHE STRING "Target Platform")
 
 if(${TIM_VX_CODE_COVERAGE})
     set(CMAKE_CXX_FLAGS "-g -O0 --coverage -fprofile-arcs -ftest-coverage")
     set(CMAKE_C_FLAGS "-g -O0 --coverage -fprofile-arcs -ftest-coverage")
 endif()
 
-
 if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
-  set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/install" CACHE PATH "..." FORCE)
+  set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/install" CACHE PATH "" FORCE)
 endif()
 
 set(CMAKE_C_VISIBILITY_PRESET hidden)
@@ -26,6 +26,7 @@ if(EXTERNAL_VIV_SDK AND EXISTS ${EXTERNAL_VIV_SDK})
     # this is for internal development purpose
     include(cmake/local_sdk.cmake)
 else()
+    set(TIM_VX_ENABLE_TEST OFF)
     if("${CONFIG}" STREQUAL "A311D")
         include(cmake/A311D.cmake)
     elseif("${CONFIG}" STREQUAL "S905D3")
@@ -35,6 +36,7 @@ else()
     elseif("${CONFIG}" STREQUAL "YOCTO")
         include(cmake/YOCTO.cmake)
     else()
+        set(TIM_VX_ENABLE_TEST ON)
         include(cmake/X86_64_linux.cmake)
     endif()
 endif()
@@ -49,7 +51,12 @@ if(TIM_VX_ENABLE_TEST)
 
     set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
     set(INSTALL_GTEST OFF CACHE BOOL "" FORCE)
-    FetchContent_MakeAvailable(googletest)
+
+    FetchContent_GetProperties(googletest)
+    if(NOT googletest_POPULATED)
+        FetchContent_Populate(googletest)
+        add_subdirectory(${googletest_SOURCE_DIR} ${googletest_BINARY_DIR})
+    endif()
 endif()
 
 include_directories(${PROJECT_SOURCE_DIR}/include/tim/vx)