diff --git a/CMakeLists.txt b/CMakeLists.txt
index 334a0f613a..c104e7c700 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -56,6 +56,9 @@ option(BUILD_ROCPTEST "Build targets for librdc_rocp.so" OFF)
 # When cmake -DBUILD_TESTS=off, it will not build RDC tests.
 option(BUILD_TESTS "Build test suite" OFF)
 
+# Enable shared libraries for gtest
+option(BUILD_SHARED_LIBS "Build shared library (.so) or not." ON)
+
 # File reorganization enable/disable
 option(FILE_REORG_BACKWARD_COMPATIBILITY "Enable File Reorg with backward compatibility" OFF)
 
@@ -159,7 +162,7 @@ set(${RDC}_VERSION_PATCH "0")
 set(${RDC}_VERSION_BUILD "0")
 set(CPACK_PACKAGE_VERSION ${VERSION_STRING})
 
-set(CMAKE_CXX_STANDARD 11 CACHE STRING "The C++ standard to use")
+set(CMAKE_CXX_STANDARD 17 CACHE STRING "The C++ standard to use")
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index 2b6fbd8755..fa0f3b1deb 100755
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -24,7 +24,7 @@ message("&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&")
 
 ## Compiler flags
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -m64")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse -msse2 -std=c++11 ")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse -msse2")
 # Use this instead of above for 32 bit
 # set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32")
 
diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt
index be8c07df75..959d0913d2 100755
--- a/example/CMakeLists.txt
+++ b/example/CMakeLists.txt
@@ -32,7 +32,7 @@ option(CMAKE_VERBOSE_MAKEFILE "Enable verbose output" ON)
 option(CMAKE_EXPORT_COMPILE_COMMANDS "Export compile commands for linters and autocompleters" ON)
 
 # Compiler flags
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -m64 -msse -msse2 -std=c++11 -pthread")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -m64 -msse -msse2 -pthread")
 
 if("${CMAKE_BUILD_TYPE}" STREQUAL Release)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2")
@@ -40,7 +40,7 @@ else()
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ggdb -O0 -DDEBUG")
 endif()
 
-set(CMAKE_CXX_STANDARD 11 CACHE STRING "The C++ standard to use")
+set(CMAKE_CXX_STANDARD 17 CACHE STRING "The C++ standard to use")
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
diff --git a/rdc_libs/CMakeLists.txt b/rdc_libs/CMakeLists.txt
index b1bcc58419..753a34f14c 100755
--- a/rdc_libs/CMakeLists.txt
+++ b/rdc_libs/CMakeLists.txt
@@ -24,7 +24,7 @@ message("&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&")
 
 ## Compiler flags
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -m64")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse -msse2 -std=c++11 ")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse -msse2")
 # Use this instead of above for 32 bit
 # set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32")
 
diff --git a/rdci/CMakeLists.txt b/rdci/CMakeLists.txt
index 5d0d729d11..bba31d962f 100644
--- a/rdci/CMakeLists.txt
+++ b/rdci/CMakeLists.txt
@@ -41,7 +41,7 @@ message("")
 
 ## Compiler flags
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -m64")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse -msse2 -std=c++11 -pthread ")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse -msse2 -pthread")
 # Use this instead of above for 32 bit
 # set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32")
 
diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
index 2c8b7020ba..5d2696adf1 100755
--- a/server/CMakeLists.txt
+++ b/server/CMakeLists.txt
@@ -38,7 +38,7 @@ message("")
 
 ## Compiler flags
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -m64")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse -msse2 -std=c++11 ")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse -msse2")
 # Use this instead of above for 32 bit
 # set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32")
 
diff --git a/tests/example/CMakeLists.txt b/tests/example/CMakeLists.txt
index a8fbf38e2a..eed3eb7ff4 100755
--- a/tests/example/CMakeLists.txt
+++ b/tests/example/CMakeLists.txt
@@ -24,7 +24,7 @@ message("&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&")
 
 ## Compiler flags
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -m64")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse -msse2 -std=c++11 ")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse -msse2")
 # Use this instead of above for 32 bit
 # set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32")
 
diff --git a/tests/rdc_tests/CMakeLists.txt b/tests/rdc_tests/CMakeLists.txt
index 69e821ccf7..7d2c4e0e58 100755
--- a/tests/rdc_tests/CMakeLists.txt
+++ b/tests/rdc_tests/CMakeLists.txt
@@ -49,20 +49,13 @@ set(SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR})
 
 set(RDCTST "rdctst")
 
-# Try to find googletest
-find_package(GTest 1.11.0)
-
-# GTest_FOUND is set to TRUE if ANY version is found
-# GTest_VERSION is set if 1.11.0 or newer version is found
-if(NOT GTest_FOUND STREQUAL "TRUE" OR NOT DEFINED GTest_VERSION)
-    # Google Test wasn't found. Download and compile ourselves
-    include(FetchContent)
-    FetchContent_Declare(
-        googletest
-        GIT_REPOSITORY https://github.com/google/googletest.git
-        GIT_TAG release-1.11.0)
-    FetchContent_MakeAvailable(googletest)
-endif()
+# Download and compile googletest
+include(FetchContent)
+FetchContent_Declare(
+    googletest
+    GIT_REPOSITORY https://github.com/google/googletest.git
+    GIT_TAG v1.14.0)
+FetchContent_MakeAvailable(googletest)
 
 # Source files
 aux_source_directory(${SRC_DIR} rdctstSources)
@@ -83,15 +76,15 @@ target_include_directories(
     PUBLIC ${SRC_DIR}/..)
 
 target_link_libraries(${RDCTST}
-    PUBLIC GTest::gtest_main
     PUBLIC rdc_bootstrap
     PUBLIC rdc
     PUBLIC rdc_ras
+    PUBLIC GTest::gtest_main
     PUBLIC c
     PUBLIC stdc++
     PUBLIC pthread)
 
-install(TARGETS ${RDCTST}
+install(TARGETS ${RDCTST} gtest gtest_main
     DESTINATION ${RDC_SHARE_INSTALL_PREFIX}/rdctst_tests
     COMPONENT ${TESTS_COMPONENT})