From 0792a9ca9adf0440016b059d6ab2cbb17b46d1e1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 May 2023 16:35:53 +0200
Subject: [PATCH] Bump dependencies/fff from `11ab05b` to `5111c61` (#17)

* Bump dependencies/fff from `11ab05b` to `5111c61`

Bumps [dependencies/fff](https://github.com/meekrosoft/fff) from `11ab05b` to `5111c61`.
- [Release notes](https://github.com/meekrosoft/fff/releases)
- [Commits](https://github.com/meekrosoft/fff/compare/11ab05b518272b1698935a6e617d7894b713c462...5111c61e1ef7848e3afd3550044a8cf4405f4199)

---
updated-dependencies:
- dependency-name: dependencies/fff
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

* Adapt to FetchContent of gtest

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Andreas Baulig <free.geronimo@hotmail.de>
---
 Makefile               | 11 +++++++----
 dependencies/fff       |  2 +-
 dependencies/fff.patch | 13 -------------
 3 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/Makefile b/Makefile
index c3c3122..60a629a 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,9 @@ FFF_DIR ?= $(DEPENDENCIES_DIR)/fff
 FFF_PATCH_HINT = $(DEPENDENCIES_DIR)/fff/patched_by_autofff
 
 # Build settings
-GTEST_OBJS ?= $(FFF_DIR)/build/gtest/libgtest.a
+GTEST_OBJS ?= \
+	$(FFF_DIR)/build/lib/libgtest_main.a \
+	$(FFF_DIR)/build/lib/libgtest.a
 TEST_SOURCES = $(wildcard $(TEST_DIR)/*_unittest.cc)
 TEST_EXES = $(patsubst $(TEST_DIR)/%,$(OUTPUT_DIR)/%,$(TEST_SOURCES:%.cc=%.exe))
 TEST_INCLUDES = \
@@ -17,7 +19,8 @@ TEST_INCLUDES = \
 	-I$(EXAMPLES_DIR) \
 	-I$(OUTPUT_DIR) \
 	-I$(FFF_DIR) \
-	-I$(FFF_DIR)/gtest/include/gtest
+	-I$(FFF_DIR)/build/_deps/googletest-src/googletest/include \
+	-I$(FFF_DIR)/build/_deps/googletest-src/googletest/include/gtest
 TEST_HEADERS = $(wildcard $(EXAMPLES_DIR)/*.h)
 TEST_FAKES = $(patsubst $(EXAMPLES_DIR)/%,$(OUTPUT_DIR)/%,$(TEST_HEADERS:%.h=%_th.h))
 
@@ -49,8 +52,8 @@ $(FFF_PATCH_HINT):
 
 .PHONY: gtest_lib
 build_gtest_lib: patch_fff
-	$(CMAKE) -B $(FFF_DIR)/build $(FFF_DIR)
-	$(CMAKE) --build $(FFF_DIR)/build --target gtest
+	$(CMAKE) -B $(FFF_DIR)/build $(FFF_DIR) -DFFF_UNIT_TESTING=ON
+	$(CMAKE) --build $(FFF_DIR)/build
 	@echo
 
 .PHONY: unpatch_fff
diff --git a/dependencies/fff b/dependencies/fff
index 11ab05b..5111c61 160000
--- a/dependencies/fff
+++ b/dependencies/fff
@@ -1 +1 @@
-Subproject commit 11ab05b518272b1698935a6e617d7894b713c462
+Subproject commit 5111c61e1ef7848e3afd3550044a8cf4405f4199
diff --git a/dependencies/fff.patch b/dependencies/fff.patch
index 14b7299..e621488 100644
--- a/dependencies/fff.patch
+++ b/dependencies/fff.patch
@@ -11,16 +11,3 @@ index 80d09cc..0f15940 100644
  project(fff)
 
  set(CMAKE_CXX_STANDARD 11)
-diff --git a/gtest/CMakeLists.txt b/gtest/CMakeLists.txt
-index c223ef6..386e5e0 100644
---- a/gtest/CMakeLists.txt
-+++ b/gtest/CMakeLists.txt
-@@ -1,7 +1,7 @@
- # Copyright 2022 Google LLC
- # SPDX-License-Identifier: Apache-2.0
-
--cmake_minimum_required(VERSION 3.20.0)
-+cmake_minimum_required(VERSION 3.18.0)
-
- find_package(Threads REQUIRED)
- set(CMAKE_EXE_LINKER_FLAGS " -static")