mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-04 14:39:54 +00:00
Code Issues Projects Releases Wiki Activity

leveldb: prevent installing gtest

Browse Source 
* Causes conflicts when leveldb is used in component which itself also depends
  on gtest e.g. leveldb-tl in meta-webosose:

  ERROR: lib32-leveldb-tl-0.1.6-r4 do_prepare_recipe_sysroot: The file
  /usr/lib/pkgconfig/gtest.pc is installed by both lib32-googletest and
  lib32-leveldb, aborting

Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Martin Jansa
2023-10-21 02:05:52 +02:00
committed by Khem Raj
parent a0f6f4da0b
commit 6ffae4286a
2 changed files with 58 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-dbs/leveldb/leveldb/0001-CMakeLists.txt-fix-googletest-related-options.patch
+55
View File
@@ -0,0 +1,55 @@
From 77da477840f89da7ced29da315de77571e8f190e Mon Sep 17 00:00:00 2001
From: Martin Jansa <martin.jansa@gmail.com>
Date: Fri, 20 Oct 2023 22:57:48 +0200
Subject: [PATCH] CMakeLists.txt: fix googletest related options
* https://cmake.org/cmake/help/book/mastering-cmake/chapter/Writing%20CMakeLists%20Files.html
says that CMake options are case-sensitive and I don't see lower-case version in
currently used googletest submodules and gtest is indeed installed with leveldb
* install_gmock option I don't see at all, so I've kept it as is, INSTALL_GTEST, BUILD_GMOCK
do exist as upper-case
$ grep -Ri install_.*mock .
./CMakeLists.txt: set(install_gmock OFF)
./third_party/googletest/googlemock/CMakeLists.txt:install_project(gmock gmock_main)
$ grep -Ri build_gmock .
./CMakeLists.txt: set(BUILD_GMOCK ON)
./third_party/googletest/googletest/README.md:cmake .. -DBUILD_GMOCK=OFF
./third_party/googletest/CMakeLists.txt:option(BUILD_GMOCK "Builds the googlemock subproject" ON)
./third_party/googletest/CMakeLists.txt:if(BUILD_GMOCK)
$ grep -Ri install_gtest .
./CMakeLists.txt: set(INSTALL_GTEST OFF)
./third_party/googletest/googletest/cmake/internal_utils.cmake: if(INSTALL_GTEST)
./third_party/googletest/googletest/CMakeLists.txt:if (INSTALL_GTEST)
./third_party/googletest/CMakeLists.txt:option(INSTALL_GTEST "Enable installation of googletest. (Projects embedding googletest may want to turn this OFF.)" ON)
* also use CACHE and FORCE as sugested in:
https://cmake.org/cmake/help/latest/command/set.html
https://stackoverflow.com/questions/20239334/cmake-set-subdirectory-options
for the value to correctly propagate into third_party/googletest subdirectory
Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
---
Upstream-Status: Submitted [https://github.com/google/leveldb/pull/1152]
CMakeLists.txt | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fda9e01..f8a2629 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -295,9 +295,9 @@ if(LEVELDB_BUILD_TESTS)
# Prevent overriding the parent project's compiler/linker settings on Windows.
set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
- set(install_gtest OFF)
- set(install_gmock OFF)
- set(build_gmock ON)
+ set(INSTALL_GTEST OFF CACHE BOOL "" FORCE)
+ set(install_gmock OFF CACHE BOOL "" FORCE)
+ set(BUILD_GMOCK ON CACHE BOOL "" FORCE)
# This project is tested using GoogleTest.
add_subdirectory("third_party/googletest")
meta-oe/recipes-dbs/leveldb/leveldb_1.23.bb
+3 -1
View File
@@ -5,7 +5,9 @@ LICENSE = "BSD-3-Clause"
LIC_FILES_CHKSUM = "file://LICENSE;md5=92d1b128950b11ba8495b64938fc164d"
SRC_URI = "gitsm://github.com/google/${BPN}.git;branch=main;protocol=https \
file://run-ptest"
file://0001-CMakeLists.txt-fix-googletest-related-options.patch \
file://run-ptest \
"
SRCREV = "068d5ee1a3ac40dabd00d211d5013af44be55bea"
S = "${WORKDIR}/git"