diff options
author | Egor Tensin <Egor.Tensin@gmail.com> | 2023-07-04 09:00:37 +0200 |
---|---|---|
committer | Egor Tensin <Egor.Tensin@gmail.com> | 2023-07-04 09:00:37 +0200 |
commit | 4bcbf7dbadb234657c6853c26e113184c74eb0a2 (patch) | |
tree | 091ca8b505b277c9cb3cc228eb25836438b6b4bf /Makefile | |
parent | Makefile: move the prelude to prelude.mk (diff) | |
download | aes-tools-4bcbf7dbadb234657c6853c26e113184c74eb0a2.tar.gz aes-tools-4bcbf7dbadb234657c6853c26e113184c74eb0a2.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
@@ -1,6 +1,7 @@ include prelude.mk TOOLSET ?= mingw +PLATFORM ?= auto CONFIGURATION ?= Debug BOOST_VERSION ?= 1.72.0 BOOST_LIBRARIES := --with-filesystem --with-program_options @@ -8,16 +9,13 @@ CMAKE_FLAGS ?= 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 $(eval $(call noexpand,TOOLSET)) +$(eval $(call noexpand,PLATFORM)) $(eval $(call noexpand,CONFIGURATION)) $(eval $(call noexpand,BOOST_VERSION)) $(eval $(call noexpand,CMAKE_FLAGS)) @@ -38,34 +36,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 |