diff options
| author | Egor Tensin <Egor.Tensin@gmail.com> | 2023-07-04 03:23:13 +0200 |
|---|---|---|
| committer | Egor Tensin <Egor.Tensin@gmail.com> | 2023-07-04 03:23:13 +0200 |
| commit | 4e6e8d8c151c9eb7888927e816dc3756a600ec0f (patch) | |
| tree | d31e0034ec19c1fb758348d14a5f1b37693da05c /Makefile | |
| parent | Makefile: move the prelude to prelude.mk (diff) | |
| download | math-server-4e6e8d8c151c9eb7888927e816dc3756a600ec0f.tar.gz math-server-4e6e8d8c151c9eb7888927e816dc3756a600ec0f.zip | |
update cmake-common
Also, change the build directory to build/.
Diffstat (limited to '')
| -rw-r--r-- | Makefile | 23 |
1 files changed, 7 insertions, 16 deletions
@@ -5,6 +5,7 @@ DO: PROJECT := math-server TOOLSET ?= auto +PLATFORM ?= auto CONFIGURATION ?= Debug BOOST_VERSION ?= 1.72.0 BOOST_LIBRARIES := --with-filesystem --with-program_options --with-regex --with-test @@ -12,11 +13,7 @@ CMAKE_FLAGS ?= -D MATH_SERVER_TESTS=ON this_dir := $(dir $(realpath $(firstword $(MAKEFILE_LIST)))) src_dir := $(this_dir) -ifdef CI -build_dir := $(this_dir)../build -else -build_dir := $(this_dir).build -endif +build_dir := $(this_dir)build boost_dir := $(build_dir)/boost cmake_dir := $(build_dir)/cmake DESTDIR ?= $(build_dir)/install @@ -27,6 +24,7 @@ DOCKER_PLATFORMS := amd64,armhf,arm64 DOCKER_USERNAME := egortensin $(eval $(call noexpand,TOOLSET)) +$(eval $(call noexpand,PLATFORM)) $(eval $(call noexpand,CONFIGURATION)) $(eval $(call noexpand,BOOST_VERSION)) $(eval $(call noexpand,CMAKE_FLAGS)) @@ -50,34 +48,27 @@ $(boost_dir)/: '$(call escape,$(boost_dir))' .PHONY: deps -ifdef CI -deps: - cd cmake && python3 -m project.ci.boost -- $(BOOST_LIBRARIES) -else deps: $(boost_dir)/ cd cmake && python3 -m project.boost.build \ --toolset '$(call escape,$(TOOLSET))' \ + --platform '$(call escape,$(PLATFORM))' \ --configuration '$(call escape,$(CONFIGURATION))' \ -- \ '$(call escape,$(boost_dir))' \ $(BOOST_LIBRARIES) -endif .PHONY: build build: -ifdef CI - cd cmake && python3 -m project.ci.cmake --install -- $(CMAKE_FLAGS) -else - cd cmake && python3 -m project.cmake.build \ + cd cmake && python3 -m project.build \ --toolset '$(call escape,$(TOOLSET))' \ + --platform '$(call escape,$(PLATFORM))' \ --configuration '$(call escape,$(CONFIGURATION))' \ - --build '$(call escape,$(cmake_dir))' \ --install '$(call escape,$(DESTDIR))' \ --boost '$(call escape,$(boost_dir))' \ -- \ '$(call escape,$(src_dir))' \ + '$(call escape,$(cmake_dir))' \ $(CMAKE_FLAGS) -endif .PHONY: install install: build |