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

Makefile: move QT dir check to separate target 

This way we avoid errors about missing QT when calling targets that do
not require it, like `make clean` or `make deps`.

Signed-off-by: Jakub Sokołowski <jakub@status.im>
This commit is contained in:
Jakub Sokołowski 2022-11-08 10:11:53 +01:00
parent d23cce99a0
commit 0cf2c9c8da
No known key found for this signature in database
GPG Key ID: 09AA5403E54D9931
1 changed files with 27 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Makefile
View File

@ -16,6 +16,7 @@ BUILD_SYSTEM_DIR := vendor/nimbus-build-system
.PHONY: \ .PHONY: \
all \ all \
bottles \ bottles \
check-qt-dir \
check-pkg-target-linux \ check-pkg-target-linux \
check-pkg-target-macos \ check-pkg-target-macos \
check-pkg-target-windows \ check-pkg-target-windows \
@ -89,6 +90,12 @@ else
RUN_TARGET := run-linux RUN_TARGET := run-linux
endif endif
check-qt-dir:
ifeq ($(QTDIR),)
$(error Cannot find your Qt5 installation. Please run "$(MAKE) QTDIR=/path/to/your/Qt5/installation/prefix ...")
endif
check-pkg-target-linux: check-pkg-target-linux:
ifneq ($(detected_OS),Linux) ifneq ($(detected_OS),Linux)
$(error The pkg-linux target must be run on Linux) $(error The pkg-linux target must be run on Linux)
@ -124,9 +131,9 @@ $(BOTTLES_DIR):
bottles: $(BOTTLES) bottles: $(BOTTLES)
endif endif
deps: | deps-common bottles deps: check-qt-dir | deps-common bottles
update: | update-common update: check-qt-dir | update-common
QML_DEBUG ?= false QML_DEBUG ?= false
QML_DEBUG_PORT ?= 49152 QML_DEBUG_PORT ?= 49152
@ -144,9 +151,6 @@ ifneq ($(detected_OS),Windows)
QT5_PCFILEDIR := $(shell pkg-config --variable=pcfiledir Qt5Core 2>/dev/null) QT5_PCFILEDIR := $(shell pkg-config --variable=pcfiledir Qt5Core 2>/dev/null)
QT5_LIBDIR := $(shell pkg-config --variable=libdir Qt5Core 2>/dev/null) QT5_LIBDIR := $(shell pkg-config --variable=libdir Qt5Core 2>/dev/null)
ifeq ($(QT5_PCFILEDIR),) ifeq ($(QT5_PCFILEDIR),)
ifeq ($(QTDIR),)
$(error Cannot find your Qt5 installation. Please run "$(MAKE) QTDIR=/path/to/your/Qt5/installation/prefix ...")
else
QT5_PCFILEDIR := $(QTDIR)/lib/pkgconfig QT5_PCFILEDIR := $(QTDIR)/lib/pkgconfig
QT5_LIBDIR := $(QTDIR)/lib QT5_LIBDIR := $(QTDIR)/lib
# some manually installed Qt5 instances have wrong paths in their *.pc files, so we pass the right one to the linker here # some manually installed Qt5 instances have wrong paths in their *.pc files, so we pass the right one to the linker here
@ -164,7 +168,6 @@ ifneq ($(detected_OS),Windows)
NIM_PARAMS += --passL:"-L$(QT5_LIBDIR)" NIM_PARAMS += --passL:"-L$(QT5_LIBDIR)"
endif endif
endif endif
endif
DOTHERSIDE := vendor/DOtherSide/build/lib/libDOtherSideStatic.a DOTHERSIDE := vendor/DOtherSide/build/lib/libDOtherSideStatic.a
DOTHERSIDE_CMAKE_PARAMS += -DENABLE_DYNAMIC_LIBS=OFF -DENABLE_STATIC_LIBS=ON DOTHERSIDE_CMAKE_PARAMS += -DENABLE_DYNAMIC_LIBS=OFF -DENABLE_STATIC_LIBS=ON
# order matters here, due to "-Wl,-as-needed" # order matters here, due to "-Wl,-as-needed"
@ -287,7 +290,7 @@ endif
UI_RESOURCES := resources.rcc UI_RESOURCES := resources.rcc
$(UI_RESOURCES): $(UI_SOURCES) $(UI_RESOURCES): check-qt-dir $(UI_SOURCES)
echo -e $(BUILD_MSG) "resources.rcc" echo -e $(BUILD_MSG) "resources.rcc"
rm -f ./resources.rcc rm -f ./resources.rcc
rm -f ./ui/resources.qrc rm -f ./ui/resources.qrc
@ -300,7 +303,7 @@ TS_SOURCES := $(shell find ui/i18n -iname '*.ts') # ui/i18n/qml_*.ts
QM_BINARIES := $(shell find ui/i18n -iname "*.ts" | sed 's/\.ts/\.qm/' | sed 's/ui/bin/') # bin/i18n/qml_*.qm QM_BINARIES := $(shell find ui/i18n -iname "*.ts" | sed 's/\.ts/\.qm/' | sed 's/ui/bin/') # bin/i18n/qml_*.qm
$(QM_BINARIES): TS_FILE = $(shell echo $@ | sed 's/\.qm/\.ts/' | sed 's/bin/ui/') $(QM_BINARIES): TS_FILE = $(shell echo $@ | sed 's/\.qm/\.ts/' | sed 's/bin/ui/')
$(QM_BINARIES): $(TS_SOURCES) $(QM_BINARIES): check-qt-dir $(TS_SOURCES)
mkdir -p bin/i18n mkdir -p bin/i18n
lrelease -removeidentical $(TS_FILE) -qm $@ lrelease -removeidentical $(TS_FILE) -qm $@
@ -355,7 +358,7 @@ else
endif endif
$(NIM_STATUS_CLIENT): NIM_PARAMS += $(RESOURCES_LAYOUT) $(NIM_STATUS_CLIENT): NIM_PARAMS += $(RESOURCES_LAYOUT)
$(NIM_STATUS_CLIENT): $(NIM_SOURCES) $(DOTHERSIDE) | $(STATUSGO) $(STATUSKEYCARDGO) $(QRCODEGEN) $(FLEETS) rcc $(QM_BINARIES) deps $(NIM_STATUS_CLIENT): check-qt-dir $(NIM_SOURCES) $(DOTHERSIDE) | $(STATUSGO) $(STATUSKEYCARDGO) $(QRCODEGEN) $(FLEETS) rcc $(QM_BINARIES) deps
echo -e $(BUILD_MSG) "$@" && \ echo -e $(BUILD_MSG) "$@" && \
$(ENV_SCRIPT) nim c $(NIM_PARAMS) --passL:"-L$(STATUSGO_LIBDIR)" --passL:"-lstatus" --passL:"-L$(STATUSKEYCARDGO_LIBDIR)" --passL:"-lkeycard" $(NIM_EXTRA_PARAMS) --passL:"$(QRCODEGEN)" --passL:"-lm" src/nim_status_client.nim && \ $(ENV_SCRIPT) nim c $(NIM_PARAMS) --passL:"-L$(STATUSGO_LIBDIR)" --passL:"-lstatus" --passL:"-L$(STATUSKEYCARDGO_LIBDIR)" --passL:"-lkeycard" $(NIM_EXTRA_PARAMS) --passL:"$(QRCODEGEN)" --passL:"-lm" src/nim_status_client.nim && \
[[ $$? = 0 ]] && \ [[ $$? = 0 ]] && \
@ -398,7 +401,7 @@ ifeq ($(detected_OS),Linux)
FCITX5_QT_BUILD_CMD := cmake --build . --config Release $(HANDLE_OUTPUT) FCITX5_QT_BUILD_CMD := cmake --build . --config Release $(HANDLE_OUTPUT)
endif endif
$(FCITX5_QT): | deps $(FCITX5_QT): check-qt-dir | deps
echo -e $(BUILD_MSG) "fcitx5-qt" echo -e $(BUILD_MSG) "fcitx5-qt"
+ cd vendor/fcitx5-qt && \ + cd vendor/fcitx5-qt && \
mkdir -p build && \ mkdir -p build && \