mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-07-16 04:17:25 +00:00
projucer: Update to latest master tip
Drop patch which no longer is needed as it has been fixed differently upstream License-Update: Updated to reflect JUCE 6 Terms [1] [1] https://github.com/juce-framework/JUCE/commit/de6ecc57f84294e82a608bcc6d0f5d11645f15e3#diff-4673a3aba01813b595de187a7a6e9e63a3491d55821606fecd9f13a10c188a1d Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
+41
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user