diff options
| author | Egor Tensin <egor@tensin.name> | 2026-02-17 11:05:25 +0100 |
|---|---|---|
| committer | Egor Tensin <egor@tensin.name> | 2026-02-17 11:05:25 +0100 |
| commit | 77720ab2251ffe5f79b11190de3cb0143f74e65a (patch) | |
| tree | 679d1a1edcf9f6c685dc11b56e37fc5f482e5f3f | |
| parent | cmake: use CONFIGURE_DEPENDS (diff) | |
| download | winapi-utf8-77720ab2251ffe5f79b11190de3cb0143f74e65a.tar.gz winapi-utf8-77720ab2251ffe5f79b11190de3cb0143f74e65a.zip | |
try out the pre-release cmake-common version
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | Makefile | 3 | ||||
| m--------- | cmake | 0 | ||||
| -rw-r--r-- | test/CMakeLists.txt | 4 |
4 files changed, 4 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 226adb2..96a975d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,11 +1,9 @@ # For CONFIGURE_DEPENDS -cmake_minimum_required(VERSION 3.12) +cmake_minimum_required(VERSION 3.30) project(winapi_utf8 CXX) enable_testing() -include(cmake/common.cmake) - file(GLOB_RECURSE winapi_utf8_include CONFIGURE_DEPENDS "include/*.hpp") file(GLOB winapi_utf8_src CONFIGURE_DEPENDS "src/*.cpp") add_library(winapi_utf8 ${winapi_utf8_include} ${winapi_utf8_src}) @@ -12,7 +12,6 @@ PLATFORM ?= auto CONFIGURATION ?= Debug BOOST_VERSION ?= 1.81.0 BOOST_LIBRARIES := --with-test -CMAKE_FLAGS ?= -D WINAPI_UTF8_TESTS=ON INSTALL_PREFIX ?= $(install_dir) $(eval $(call noexpand,TOOLSET)) @@ -54,10 +53,10 @@ build: --configuration '$(call escape,$(CONFIGURATION))' \ --install '$(call escape,$(INSTALL_PREFIX))' \ --boost '$(call escape,$(boost_dir))' \ + --cmake-arg=-DWINAPI_UTF8_TESTS=ON \ -- \ '$(call escape,$(src_dir))' \ '$(call escape,$(cmake_dir))' \ - $(CMAKE_FLAGS) .PHONY: install install: build diff --git a/cmake b/cmake -Subproject 9e7304af2fe5a4f89da64ac76768697aac4f858 +Subproject b632496eb6769c5626e95e3df8a4ff45259474d diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index bf023a6..fac2824 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -1,4 +1,4 @@ -find_package(Boost REQUIRED COMPONENTS unit_test_framework) +find_package(Boost CONFIG REQUIRED COMPONENTS unit_test_framework) file(GLOB unit_tests_src "*.cpp") add_executable(unit_tests ${unit_tests_src}) @@ -6,7 +6,7 @@ set_target_properties(unit_tests PROPERTIES OUTPUT_NAME winapi-utf8-unit-tests) target_link_libraries(unit_tests PRIVATE winapi_utf8) target_link_libraries(unit_tests PRIVATE Boost::disable_autolinking Boost::unit_test_framework) install(TARGETS unit_tests RUNTIME DESTINATION bin) -install_pdbs(TARGETS unit_tests DESTINATION bin) +#install_pdbs(TARGETS unit_tests DESTINATION bin) add_test(NAME unit_tests COMMAND unit_tests) set_tests_properties(unit_tests PROPERTIES |