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](meekrosoft/fff@11ab05b...5111c61) --- updated-dependencies: - dependency-name: dependencies/fff dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> * Adapt to FetchContent of gtest --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Andreas Baulig <[email protected]>
ChiefGokhlayeh · May 22, 2023 · 0792a9c · 0792a9c
1 parent 56311d5
commit 0792a9c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 18 deletions.
diff --git a/Makefile b/Makefile
@@ -9,15 +9,18 @@ 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 = \
 	-I$(TEST_DIR) \
 	-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
diff --git 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")
+30 −18		CMakeLists.txt
+1 −1		README.md
+1 −1		buildandtest
+2 −2		examples/driver_testing/CMakeLists.txt
+1 −1		examples/embedded_ui/CMakeLists.txt
+3 −3		fakegen.rb
+0 −61		fff.h
+0 −12		gtest/CMakeLists.txt
+0 −19,555		gtest/include/gtest/gtest.h
+0 −9,118		gtest/src/gtest-all.cc
+0 −6		gtest/src/gtest-main.cc
+14 −3		test/CMakeLists.txt