fixes docker output directory

pull/2/head
nosamad 6 years ago
parent 64ecec9079
commit 60fe3fc171

@ -89,8 +89,8 @@ $(OUT)/docker/%: $(PROJECT_ROOT)/docker/%.dockerfile $(PROJECT_RESOURCES) | $(OU
$(OUT)/%/CMakeCache.txt: $(PROJECT_ROOT)/CMakeLists.txt $(OUT)/docker/% | $(OUT_DIRS) $(OUT)/%/CMakeCache.txt: $(PROJECT_ROOT)/CMakeLists.txt $(OUT)/docker/% | $(OUT_DIRS)
$(SILENT)$(DOCKER) run $(DOCKER_RUNFLAGS) \ $(SILENT)$(DOCKER) run $(DOCKER_RUNFLAGS) \
--volume '$(realpath $(PROJECT_ROOT)):/tmp' \ --volume '$(realpath $(PROJECT_ROOT)):/tmp' \
--volume '$(realpath $(dir $@)):/tmp/out' \ --volume '$(realpath $(dir $@)):/tmp/$(notdir $(OUT))' \
--workdir /tmp/out \ --workdir '/tmp/$(notdir $(OUT))' \
$*:$(VERSION) \ $*:$(VERSION) \
cmake -GNinja $(CMAKEFLAGS) .. && touch $@ cmake -GNinja $(CMAKEFLAGS) .. && touch $@
@ -102,8 +102,8 @@ check-%: compile-%;
compile-%: $(OUT)/%/CMakeCache.txt compile-%: $(OUT)/%/CMakeCache.txt
$(SILENT)$(DOCKER) run $(DOCKER_RUNFLAGS) \ $(SILENT)$(DOCKER) run $(DOCKER_RUNFLAGS) \
--volume '$(realpath $(PROJECT_ROOT)):/tmp' \ --volume '$(realpath $(PROJECT_ROOT)):/tmp' \
--volume '$(realpath $(dir $^)):/tmp/out' \ --volume '$(realpath $(dir $<)):/tmp/$(notdir $(OUT))' \
--workdir /tmp/out \ --workdir '/tmp/$(notdir $(OUT))' \
$*:$(VERSION) \ $*:$(VERSION) \
ninja -j$(NPROC) $(GLOAS) ninja -j$(NPROC) $(GLOAS)

Loading…
Cancel
Save