From c3ba2eb9b400b00f3d94671ad4a66a6eaaf50f15 Mon Sep 17 00:00:00 2001 From: Egor Tensin Date: Sun, 17 May 2026 19:49:03 +0200 Subject: upgrade cmake-common --- CMakeLists.txt | 12 ++++++++++-- Makefile | 4 ++-- cmake | 2 +- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f78398a..31291d0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,13 @@ cmake_minimum_required(VERSION 3.8) project(privilege_check CXX) -include(cmake/common.cmake) +if(MSVC) + add_compile_options(/MP /W4) +else() + add_compile_options(-Wall -Wextra) +endif() + +add_compile_definitions(WIN32_LEAN_AND_MEAN NOMINMAX) file(GLOB cpp_files "src/*.cpp") file(GLOB header_files "src/*.h" "src/*.hpp") @@ -31,6 +37,8 @@ if(MINGW) endif() install(TARGETS privilege_check RUNTIME DESTINATION bin) -install_pdbs(TARGETS privilege_check DESTINATION bin) +if(MSVC) + install(FILES $ DESTINATION bin OPTIONAL) +endif() install(FILES README.md LICENSE.txt DESTINATION share) diff --git a/Makefile b/Makefile index 77880aa..c5386df 100644 --- a/Makefile +++ b/Makefile @@ -32,10 +32,10 @@ build: --platform '$(call escape,$(PLATFORM))' \ --configuration '$(call escape,$(CONFIGURATION))' \ --install '$(call escape,$(INSTALL_PREFIX))' \ + $(CMAKE_FLAGS) \ -- \ '$(call escape,$(src_dir))' \ - '$(call escape,$(cmake_dir))' \ - $(CMAKE_FLAGS) + '$(call escape,$(cmake_dir))' .PHONY: install install: build diff --git a/cmake b/cmake index 9e7304a..899a49f 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 9e7304af2fe5a4f89da64ac76768697aac4f858e +Subproject commit 899a49f46c62aaebdc2f0988496c493f0963248b -- cgit v1.3