status-im
/
status-desktop
mirror of https://github.com/status-im/status-desktop.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(dotherside): partially successful build 

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 <jakub@status.im>
This commit is contained in:
Jakub Sokołowski 2023-11-14 13:00:08 +01:00
parent 1410b03dd3
commit 3f461c692b
No known key found for this signature in database
GPG Key ID: FE65CD384D5BF7B4
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -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"