From 0c7149b8dfb8e5352656b5fec252daa38d6e191d Mon Sep 17 00:00:00 2001 From: sfan5 Date: Fri, 2 May 2025 21:27:18 +0200 Subject: [PATCH] Build-related fixes (#16102) - fix mo files rebuilt unnecessarily - fix CMake policy warnings - update vcpkg baseline --- CMakeLists.txt | 3 +++ src/CMakeLists.txt | 11 ++++------- vcpkg.json | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2c48196d2..31059d51f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,7 @@ cmake_minimum_required(VERSION 3.12) +if(POLICY CMP0177) + cmake_policy(SET CMP0177 NEW) +endif() # This can be read from ${PROJECT_NAME} after project() is called project(luanti) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d772c10ad..75d64d344 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1117,20 +1117,17 @@ elseif (USE_GETTEXT) set_mo_paths(MO_BUILD_PATH MO_DEST_PATH ${LOCALE}) set(MO_FILE_PATH "${MO_BUILD_PATH}/${PROJECT_NAME}.mo") - add_custom_command(OUTPUT ${MO_BUILD_PATH} - COMMAND ${CMAKE_COMMAND} -E make_directory ${MO_BUILD_PATH} - COMMENT "mo-update [${LOCALE}]: Creating locale directory.") - add_custom_command( OUTPUT ${MO_FILE_PATH} + COMMAND ${CMAKE_COMMAND} -E make_directory ${MO_BUILD_PATH} COMMAND ${GETTEXT_MSGFMT} -o ${MO_FILE_PATH} ${PO_FILE_PATH} - DEPENDS ${MO_BUILD_PATH} ${PO_FILE_PATH} + DEPENDS ${PO_FILE_PATH} WORKING_DIRECTORY "${GETTEXT_PO_PATH}/${LOCALE}" - COMMENT "mo-update [${LOCALE}]: Creating mo file." + COMMENT "mo-update [${LOCALE}]: Creating mo file" ) list(APPEND MO_FILES ${MO_FILE_PATH}) endforeach() - add_custom_target(translations ALL COMMENT "mo update" DEPENDS ${MO_FILES}) + add_custom_target(translations ALL COMMENT "mo-update" DEPENDS ${MO_FILES}) endif() diff --git a/vcpkg.json b/vcpkg.json index 213f4514a..47774356b 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -1,5 +1,5 @@ { - "builtin-baseline": "d5ec528843d29e3a52d745a64b469f810b2cedbf", + "builtin-baseline": "ce613c41372b23b1f51333815feb3edd87ef8a8b", "dependencies": [ "zlib", "zstd",