diff options
| author | Egor Tensin <egor@tensin.name> | 2026-03-30 12:31:09 +0200 |
|---|---|---|
| committer | Egor Tensin <egor@tensin.name> | 2026-03-30 12:50:50 +0200 |
| commit | 2cd69db5aaaf24891e867b377048f14df49668ab (patch) | |
| tree | 412ba205e3d7b393a2ab0571131617521685cb26 | |
| parent | workflows/ci: remove on: pull_request (diff) | |
| download | winapi-utf8-2cd69db5aaaf24891e867b377048f14df49668ab.tar.gz winapi-utf8-2cd69db5aaaf24891e867b377048f14df49668ab.zip | |
still using this as a cmake-common test project
| -rw-r--r-- | .github/workflows/ci.yml | 3 | ||||
| -rw-r--r-- | Makefile | 11 | ||||
| m--------- | cmake | 0 |
3 files changed, 10 insertions, 4 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7111255..599bf6c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,7 +6,6 @@ on: env: BOOST_VERSION: 1.81.0 - CMAKE_FLAGS: -D WINAPI_UTF8_TESTS=ON jobs: lint: @@ -83,7 +82,7 @@ jobs: if: github.ref == 'refs/heads/master' env: TOOLSET: mingw - CMAKE_FLAGS: -D WINAPI_UTF8_TESTS=OFF + SKIP_TESTS: yes steps: # This is rather stupid. In order to build Doxygen docs, I need a working # CMake build directory, so I assume that means I need to pretty much @@ -11,8 +11,9 @@ TOOLSET ?= mingw PLATFORM ?= auto CONFIGURATION ?= Debug BOOST_VERSION ?= 1.81.0 -BOOST_LIBRARIES := --with-test +BOOST_LIBRARIES := test INSTALL_PREFIX ?= $(install_dir) +SKIP_TESTS ?= $(eval $(call noexpand,TOOLSET)) $(eval $(call noexpand,PLATFORM)) @@ -45,6 +46,12 @@ deps: $(boost_dir)/ '$(call escape,$(boost_dir))' \ $(BOOST_LIBRARIES) +ifneq ($(SKIP_TESTS),) +tests_args := --cmake-arg=-DWINAPI_UTF8_TESTS=OFF +else +tests_args := --cmake-arg=-DWINAPI_UTF8_TESTS=ON +endif + .PHONY: build build: cd cmake && python3 -m project.build \ @@ -53,7 +60,7 @@ build: --configuration '$(call escape,$(CONFIGURATION))' \ --install '$(call escape,$(INSTALL_PREFIX))' \ --boost '$(call escape,$(boost_dir))' \ - --cmake-arg=-DWINAPI_UTF8_TESTS=ON \ + $(tests_args) \ -- \ '$(call escape,$(src_dir))' \ '$(call escape,$(cmake_dir))' \ diff --git a/cmake b/cmake -Subproject b632496eb6769c5626e95e3df8a4ff45259474d +Subproject 71ca79a6e8293254bb626a29a353b4c09f763b2 |