diff --git a/recipes-common/rbus/files/gtest_libraries_check.patch b/recipes-common/rbus/files/gtest_libraries_check.patch deleted file mode 100644 index 843835c8..00000000 --- a/recipes-common/rbus/files/gtest_libraries_check.patch +++ /dev/null @@ -1,40 +0,0 @@ -############################################################################### -Date: Tuesday 24 January 22:10:00 UTC 2023 -Subject: With newer cmake-3.22, the FindGTest.cmake module is - slightly differenct than older cmake-3.16 module. We don't have - GTEST_INCLUDE_DIR set in latest cmake GTest module where as - GTEST_LIBRARIES and GTEST_INCLUDE_DIRS are set on both older and new modules. -Source: Comcast -License: NA -Upstream-Status: Pending -Signed-off-by: Arjun -############################################################################### ---- a/unittests/CMakeLists.txt.orig 2023-01-24 08:28:22.536357264 +0000 -+++ b/unittests/CMakeLists.txt 2023-01-24 08:31:39.383571780 +0000 -@@ -26,7 +26,7 @@ - - string(REPLACE "-Werror" "" CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS_DEBUG}) - string(REPLACE "-Werror" "" CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE}) --if (NOT GTEST_INCLUDE_DIR) -+if (NOT GTEST_LIBRARIES) - message("Warning GTest wasn't found. GTest library will be built.") - include(ExternalProject) - #include(GoogleTest) -@@ -53,7 +53,7 @@ - - include_directories("${source_dir}/googletest/include" "${source_dir}/googlemock/include") - else () -- include_directories("${GTEST_INCLUDE_DIR}") -+ include_directories("GTEST_INCLUDE_DIRS") - endif() - - # someone needs to figure out how to run this stuff under valgrind -@@ -102,7 +102,7 @@ - main.cpp) - add_dependencies(rbus_gtest.bin rbus) - --if (NOT GTEST_INCLUDE_DIR) -+if (NOT GTEST_LIBRARIES) - target_link_libraries(rbus_gtest.bin rbus libgtest libgmock gcov) - else () - target_link_libraries(rbus_gtest.bin rbus gtest gcov) diff --git a/recipes-common/rbus/rbus.bb b/recipes-common/rbus/rbus.bb index 561841fc..05da58de 100644 --- a/recipes-common/rbus/rbus.bb +++ b/recipes-common/rbus/rbus.bb @@ -4,13 +4,12 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=ed63516ecab9f06e324238dd2b259549" SRC_URI = "git://github.com/rdkcentral/rbus.git;branch=release" -SRC_URI:append = " file://gtest_libraries_check.patch" -SRCREV = "ce10ff2246632f232aa91d6723cfae123972ebe1" +SRCREV = "b193ae44c976fe8dd31d48a91f45ac7791a292f0" SRCREV_FORMAT = "base" -PV ?= "2.5.0" -PR ?= "r1" +PV ?= "2.6.0" +PR ?= "r0" PACKAGE_ARCH = "${MIDDLEWARE_ARCH}" @@ -31,10 +30,9 @@ EXTRA_OECMAKE += " -DCMAKE_BUILD_TYPE=Release " EXTRA_OECMAKE += " -DMSG_ROUNDTRIP_TIME=ON -DENABLE_RDKLOGGER=ON" #Gtest Specific Enablements -EXTRA_OECMAKE += " ${@bb.utils.contains('DISTRO_FEATURES', 'gtestapp', '-DENABLE_UNIT_TESTING=ON', '', d)}" -DEPENDS:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'gtestapp', ' gtest ', ' ', d)}" -DEPENDS:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'RBUS_ENABLE_TESTAPPS', ' benchmark ', ' ', d)}" -EXTRA_OECMAKE += " ${@bb.utils.contains('DISTRO_FEATURES', 'RBUS_ENABLE_TESTAPPS', '-DBUILD_RBUS_SAMPLE_APPS=ON -DBUILD_RBUS_TEST_APPS=ON -DBUILD_RBUS_BENCHMARK_TEST=ON', '-DBUILD_RBUS_SAMPLE_APPS=OFF -DBUILD_RBUS_TEST_APPS=OFF -DBUILD_RBUS_BENCHMARK_TEST=OFF', d)}" +EXTRA_OECMAKE += " ${@bb.utils.contains('DISTRO_FEATURES', 'gtestapp', '-DENABLE_UNIT_TESTING=ON -DBUILD_RBUS_BENCHMARK_TEST=ON', '', d)}" +EXTRA_OECMAKE += " ${@bb.utils.contains('DISTRO_FEATURES', 'RBUS_ENABLE_TESTAPPS', '-DBUILD_RBUS_SAMPLE_APPS=ON -DBUILD_RBUS_TEST_APPS=ON ', '-DBUILD_RBUS_SAMPLE_APPS=OFF -DBUILD_RBUS_TEST_APPS=OFF', d)}" +DEPENDS_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'gtestapp', ' gtest benchmark ', ' ', d)}" #Dunfell Specific CFlags CFLAGS:append = " -Wno-format-truncation "