diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-0.8.3')
2 files changed, 85 insertions, 0 deletions
diff --git a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-0.8.3/0001-Do-not-download-gtest-automatically.patch b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-0.8.3/0001-Do-not-download-gtest-automatically.patch new file mode 100644 index 000000000..5bd3801f3 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-0.8.3/0001-Do-not-download-gtest-automatically.patch @@ -0,0 +1,44 @@ +From af91a20ee201f13e56f225df536a56e5d8d259e8 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 27 May 2021 09:56:49 -0700 +Subject: [PATCH] Do not download gtest automatically + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + tests/CMakeLists.txt | 9 +-------- + tests/googletest-download/CMakeLists.txt.in | 3 --- + 2 files changed, 1 insertion(+), 11 deletions(-) + +--- a/tests/googletest-download/CMakeLists.txt.in ++++ b/tests/googletest-download/CMakeLists.txt.in +@@ -7,10 +7,7 @@ project(googletest-download NONE) + include(ExternalProject) + + ExternalProject_Add(googletest +- GIT_REPOSITORY https://github.com/google/googletest.git +- GIT_TAG master +- GIT_SHALLOW 1 +- SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/googletest-src" ++ SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/googletest-src" + BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/googletest-build" + UPDATE_COMMAND "" + CONFIGURE_COMMAND "" +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -6,9 +6,7 @@ include(FetchContent) + + message("Fetching googletest...") + FetchContent_Declare(googletest +- GIT_REPOSITORY https://github.com/google/googletest.git +- GIT_TAG master +- GIT_SHALLOW 1 ++ SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/googletest-src + UPDATE_COMMAND "") + + #FetchContent_MakeAvailable(googletest) # Not available in CMake 3.13 :-( Let's do it manually: +@@ -144,4 +142,4 @@ endif() + if(NOT CMAKE_CROSSCOMPILING) + add_test(NAME sdbus-c++-unit-tests COMMAND sdbus-c++-unit-tests) + add_test(NAME sdbus-c++-integration-tests COMMAND sdbus-c++-integration-tests) +-endif() ++endif() diff --git a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-0.8.3/0001-test-Check-for-googletest-on-system-first.patch b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-0.8.3/0001-test-Check-for-googletest-on-system-first.patch new file mode 100644 index 000000000..8a6aceac8 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-0.8.3/0001-test-Check-for-googletest-on-system-first.patch @@ -0,0 +1,41 @@ +From dc5fa7a4b342ef80cda533cdb821841d8183287c Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 23 May 2021 09:01:09 -0700 +Subject: [PATCH] test: Check for googletest on system first + +This ensures if googletest is instslled already then use that version +before downloading and building own copy + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + tests/CMakeLists.txt | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt +index 97f7c1a..3dfdd1c 100644 +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -2,6 +2,10 @@ + # DOWNLOAD AND BUILD OF GOOGLETEST + #------------------------------- + ++find_package(GTest) ++ ++if(NOT GTest_FOUND) ++ + include(FetchContent) + + message("Fetching googletest...") +@@ -23,7 +27,7 @@ if(NOT googletest_POPULATED) + add_subdirectory(${googletest_SOURCE_DIR} ${googletest_BINARY_DIR}) + set(BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS_BAK}) + endif() +- ++endif() + #------------------------------- + # SOURCE FILES CONFIGURATION + #------------------------------- +-- +2.31.1 + |