From 8dd9cf230373ed4a802004bdad3cadddd7cccf86 Mon Sep 17 00:00:00 2001
From: Deepthi C Shetty <115452109+dshett549@users.noreply.github.com>
Date: Sat, 14 Dec 2024 01:35:39 +0530
Subject: [PATCH] Fix C++ standard error during gtest compilation (#242)

Signed-off-by: Deepthi C Shetty <DEEPTHICHANDRASHEKAR_SHETTY@comcast.com>
---
 .github/workflows/unit_tests.yml |  2 +-
 CMakeLists.txt                   | 11 -----------
 unittests/CMakeLists.txt         |  2 +-
 3 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml
index 9c89bf58..4e7bd7f8 100644
--- a/.github/workflows/unit_tests.yml
+++ b/.github/workflows/unit_tests.yml
@@ -6,7 +6,7 @@ on:
      branches: [ main, 'rbus-**' ]
 jobs:
   all:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Set up cache
         id: cache
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 80fdc587..09b48e55 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -34,17 +34,6 @@ enable_testing()
 
 find_package(PkgConfig REQUIRED)
 
-if (CMAKE_VERSION VERSION_LESS "3.1")
-  message("CMAKE ${CMAKE_CXX_COMPILER_ID}")
-  if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-      set (CMAKE_CXX_FLAGS "-std=gnu++11 ${CMAKE_CXX_FLAGS}")
-      set (CMAKE_C_FLAGS "-std=c11 ${CMAKE_C_FLAGS}")
-  endif ()
-else ()
-  set (CMAKE_CXX_STANDARD 11)
-  set (CMAKE_C_STANDARD 11)
-endif ()
-
 set(CMAKE_C_FLAGS_DEBUG "-fPIC -Wall -Werror -Wextra -Wno-type-limits -fno-inline ${CMAKE_C_FLAGS_DEBUG} -DRBUS_ALWAYS_ON ")
 set(CMAKE_C_FLAGS_RELEASE "-fPIC -Wall -Werror -Wextra ${CMAKE_C_FLAGS_RELEASE} -DRBUS_ALWAYS_ON ")
 
diff --git a/unittests/CMakeLists.txt b/unittests/CMakeLists.txt
index adf280ae..f640b7e3 100644
--- a/unittests/CMakeLists.txt
+++ b/unittests/CMakeLists.txt
@@ -34,7 +34,7 @@ if (NOT GTEST_INCLUDE_DIR)
     ExternalProject_Add(
       gtest
       GIT_REPOSITORY    https://github.com/google/googletest.git
-      GIT_TAG           release-1.12.0
+      GIT_TAG           v1.15.2
       PREFIX ${CMAKE_CURRENT_BINARY_DIR}/gtest
       INSTALL_COMMAND "")