From 3f461c692b766cbba110c94d22ad46b584608b6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= Date: Tue, 14 Nov 2023 13:00:08 +0100 Subject: [PATCH] fix(dotherside): partially successful build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Andrea has encountered a case where the `CMakeCache.txt` file was created, but the `Makefile` was not, how exactly is not clear. With this change the `cmake` command will run again if the `Makefile` does not exist in the `vendor/DOtherSide/build` folder. Signed-off-by: Jakub SokoĊ‚owski --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 3504397b9..ccfb9a8b9 100644 --- a/Makefile +++ b/Makefile @@ -388,10 +388,11 @@ endif DOTHERSIDE_SOURCE_PATH := vendor/DOtherSide DOTHERSIDE_BUILD_PATH := vendor/DOtherSide/build DOTHERSIDE_CMAKE_CACHE := $(DOTHERSIDE_BUILD_PATH)/CMakeCache.txt +DOTHERSIDE_MAKEFILE := $(DOTHERSIDE_BUILD_PATH)/Makefile DOTHERSIDE_LIBDIR := $(shell pwd)/$(shell dirname "$(DOTHERSIDE_LIBFILE)") export DOTHERSIDE_LIBDIR -$(DOTHERSIDE_CMAKE_CACHE): | deps +$(DOTHERSIDE_CMAKE_CACHE) $(DOTHERSIDE_MAKEFILE): | deps echo -e "\033[92mConfiguring:\033[39m DOtherSide" cmake \ -DCMAKE_BUILD_TYPE=$(COMMON_CMAKE_BUILD_TYPE) \ @@ -404,7 +405,7 @@ $(DOTHERSIDE_CMAKE_CACHE): | deps -Wno-dev \ $(HANDLE_OUTPUT) -dotherside-configure: | $(DOTHERSIDE_CMAKE_CACHE) +dotherside-configure: | $(DOTHERSIDE_CMAKE_CACHE) $(DOTHERSIDE_MAKEFILE) dotherside-build: | dotherside-configure echo -e "\033[92mBuilding:\033[39m DOtherSide"