make: do not run cargo by cmake, just wrap build steps with standard make

Apparently CMake isn't great at handling build artifacts created by its
custom command/target. IIUC, I do need a function that would be called
add_custom_executable() so that I can replace the qmluic command while
building it:

  add_custom_executable(qmluic COMMAND cargo build)
  add_executable(Qmluic::qmluic ALIAS qmluic)

AFAIK, there's no easy way to describe such dependency. So let's reintroduce
the Make wrapper, which is super easy to write and maintain so long as I
don't care much about Windows.

Author: yuja

CMakeLists.txt

@@ -9,11 +9,9 @@ include(CMakePackageConfigHelpers)
 include(GNUInstallDirs)
 include(QmluicMacros)
 
-find_program(CARGO_COMMAND cargo DOC "cargo command" REQUIRED)
-set(CARGO_BUILD_TARGET_DIR "${CMAKE_CURRENT_SOURCE_DIR}/target" CACHE PATH "cargo build directory")
+set(CARGO_BUILD_TARGET_DIR "${CMAKE_CURRENT_SOURCE_DIR}/target")
 
-# Use the up-to-date version of the qmluic command.
-set(QMLUIC_COMMAND ${CARGO_COMMAND} run $<$<CONFIG:Release>:--release> --)
+set(QMLUIC_COMMAND "${CARGO_BUILD_TARGET_DIR}/$<IF:$<CONFIG:Release>,release,debug>/qmluic")
 
 # Help Qt Creator find our type stub
 set(QML_IMPORT_PATH "${CMAKE_CURRENT_BINARY_DIR}/imports" CACHE STRING "" FORCE)
@@ -34,14 +32,6 @@ endif()
 
 add_subdirectory(uiviewer)
 
-add_custom_target(qmluic ALL
-  COMMAND
-    ${CARGO_COMMAND} build --workspace $<$<CONFIG:Release>:--release>
-                           --target-dir "${CARGO_BUILD_TARGET_DIR}"
-  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-  USES_TERMINAL
-)
-
 qmluic_add_qmldir(qmluic.QtWidgets Qt${QT_VERSION_MAJOR}::Widgets)
 
 configure_package_config_file(cmake/QmluicConfig.cmake.in

Makefile

@@ -12,9 +12,16 @@ BUILD_TYPE = Debug
 DESTDIR =
 PREFIX = /usr/local
 
+CARGO_BUILD_FLAGS =
+CMAKE_FLAGS =
+
 DEB_VERSION = 0.1~$(shell date +"%Y%m%d").git$(shell git rev-parse --short HEAD)
 QT_VERSION_MAJOR = $(word 1,$(subst ., ,$(shell $(QMAKE) -query QT_VERSION)))
 
+ifeq ($(BUILD_TYPE),Release)
+override CARGO_BUILD_FLAGS += --release
+endif
+
 ifneq ($(shell command -v $(NINJA) 2>/dev/null),)
 CMAKE_FLAGS += -GNinja
 endif
@@ -36,6 +43,8 @@ help:
 	@echo '  build-examples - generate .ui from example .qml files and build them'
 	@echo
 	@echo 'Make variables:'
+	@echo '  BUILD_TYPE=$(BUILD_TYPE)'
+	@echo '  CARGO_BUILD_FLAGS=$(CARGO_BUILD_FLAGS)'
 	@echo '  CMAKE_FLAGS=$(CMAKE_FLAGS)'
 	@echo '  QT_VERSION_MAJOR=$(QT_VERSION_MAJOR)'
 
@@ -50,6 +59,7 @@ release:
 .PHONY: build
 build:
 	mkdir -p $(BUILD_DIR)
+	$(CARGO) build $(CARGO_BUILD_FLAGS) --workspace
 	cd $(BUILD_DIR) && $(CMAKE) -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) \
 		-DCMAKE_INSTALL_PREFIX=$(PREFIX) $(CMAKE_FLAGS) $(CURDIR)
 	$(CMAKE) --build $(BUILD_DIR) --config $(BUILD_TYPE)
@@ -78,7 +88,7 @@ format:
 .PHONY: tests
 tests:
 	$(CARGO) clippy
-	$(CARGO) test --workspace
+	$(CARGO) test $(CARGO_BUILD_FLAGS) --workspace
 
 .PHONY: build-examples
 build-examples: BUILD_DIR = target/build-examples

README.md

@@ -126,8 +126,12 @@ Optional requirements for previewer and type stubs:
 - CMake
 - Qt 5.15 or 6.2+
 
-If you have all requirements installed, use CMake (or GNU Make) to build
-and install everything.
+If you have all requirements installed, use Cargo and CMake to build/install
+the binaries and data. There's a GNU Make wrapper to automate the build steps.
+
+```
+$ make release install
+```
 
 If you just need to build the `qmluic` frontend, simply run
 `cargo build --release --workspace`.