From 4bcbf7dbadb234657c6853c26e113184c74eb0a2 Mon Sep 17 00:00:00 2001
From: Egor Tensin <Egor.Tensin@gmail.com>
Date: Tue, 4 Jul 2023 09:00:37 +0200
Subject: update cmake-common
Also, change the build directory to build/.
---
.github/workflows/ci.yml | 4 ++--
.gitignore | 2 +-
CMakeLists.txt | 2 +-
Makefile | 23 +++++++----------------
README.md | 2 +-
cmake | 2 +-
6 files changed, 13 insertions(+), 22 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 64bc844..b160b2b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -41,7 +41,7 @@ jobs:
- name: Cache Boost
uses: actions/cache@v3
with:
- path: '${{ runner.workspace }}/build/boost_*.tar.gz'
+ path: './build/boost_*.tar.gz'
key: 'boost_${{ env.BOOST_VERSION }}'
- name: Set up Python
uses: actions/setup-python@v4
@@ -60,7 +60,7 @@ jobs:
uses: actions/upload-artifact@v3
with:
name: 'aes-tools-${{ matrix.toolset }}-${{ matrix.platform }}-asm${{ matrix.use_asm }}-${{ matrix.configuration }}'
- path: '${{ runner.workspace }}/build/install/'
+ path: './build/install/'
if-no-files-found: error
- name: Test
run: make test
diff --git a/.gitignore b/.gitignore
index 0e03e15..84c048a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/.build/
+/build/
diff --git a/CMakeLists.txt b/CMakeLists.txt
index cd0acea..c86ea48 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5) # for Boost::* imported targets
+cmake_minimum_required(VERSION 3.8)
project(aes_tools C CXX)
enable_testing()
diff --git a/Makefile b/Makefile
index 6468831..de19347 100644
--- a/Makefile
+++ b/Makefile
@@ -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
diff --git a/README.md b/README.md
index e72f103..1f97036 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ Depends on Boost.{Filesystem,Program_options}.
The project is Windows-only, so building with either MSVC or MinGW-w64 is
required.
-There's a Makefile with useful shortcuts to build the project in the .build/
+There's a Makefile with useful shortcuts to build the project in the build/
directory along with the dependencies (defaults to building with MinGW-w64):
make deps
diff --git a/cmake b/cmake
index b230fff..23a96df 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit b230fffce638cdac8837ba9d9d343d9a93cef2ee
+Subproject commit 23a96df0cedd7236fbd70087c8e3ee12b222040e
--
cgit v1.2.3