From patchwork Fri Sep 25 14:28:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philippe Blain via GitGitGadget X-Patchwork-Id: 11799901 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 79D801580 for ; Fri, 25 Sep 2020 14:28:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 537D9208A9 for ; Fri, 25 Sep 2020 14:28:58 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="M3xJNELJ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728984AbgIYO2s (ORCPT ); Fri, 25 Sep 2020 10:28:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53616 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728974AbgIYO2p (ORCPT ); Fri, 25 Sep 2020 10:28:45 -0400 Received: from mail-wm1-x344.google.com (mail-wm1-x344.google.com [IPv6:2a00:1450:4864:20::344]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E1B09C0613CE for ; Fri, 25 Sep 2020 07:28:44 -0700 (PDT) Received: by mail-wm1-x344.google.com with SMTP id e2so3537337wme.1 for ; Fri, 25 Sep 2020 07:28:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=QPGEktvBa4u524d4A0i6OsR419ivIXg6j+KJkoHFQyE=; b=M3xJNELJBCVHJ/my4Oo87IBBomMXKllMBpN+aDLRvUopdk2bbkBEHQC70Jw0qV8lDP FQAElxwgy6X96WXH9tryE9FI1g0SrFMUq6MNRZXaASO8Q5d89VskiP9qHhnNKgnOecF6 eXz5lrFwne5AM2bGvY8TED4xhUIjT+Vi6RE9OG6WchnvvrnElTdvnd74g9/jZurV54Wf abKeImpfhmLHrQ+r9sBIe57XGlY8LTT0DD/qS9Oubxr7pxYWIFvNevw3JlSjS5USjk5g rEu4jFIFUKnufG7p6t6j8rB1J4/cWYE+tOqML34HQbF87HBCCR8w9LOsQhFw8HJQp4Sn tLJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=QPGEktvBa4u524d4A0i6OsR419ivIXg6j+KJkoHFQyE=; b=KrXrajq4ZdyTBhdoCKsf01p2pXtCgA4KHtdtW6Kjwi3f5GOWcV4KXACopuWQL1Nct7 gNghKgoq2/aoX/HOXtW2yIDEgLlxoUunbMOcs9bbbCFCPF4WYUxUH8pw/KU/WRM60Buh mkcXwB+g0ivNV2ecpaxdnyU1uosVusc5A4d2MX+tFIkvAo8sfN49a8vcMWjsTXQxqwfQ u+1GyeiWZ4fEocF461rpee6ZCyOuLnedL5Ifm8jEB4d8B/+PdbKr8nOcsNOKZq7tJF8n Xl8TqhkNPlAB0rqRerQePR/yowQrrnnTTMda6rVIqmL84DY/eB0SjDmWnCAdiL7JYRXY Hp1Q== X-Gm-Message-State: AOAM531YPZjqvULU5gis/zK8WH7BiPvmWsGh32TB89KvRTNWAPW08Mmj zOBAwW8gnKZ2g93jEwfHChc0RL5gHKc= X-Google-Smtp-Source: ABdhPJyFGL5GOEeQ8qJ5W3t++eOXPWQ22GqaniotGjls9MaDfTtthsmhHialBdHa9RnUgnZqL2uL1w== X-Received: by 2002:a1c:bdd4:: with SMTP id n203mr3419114wmf.119.1601044123473; Fri, 25 Sep 2020 07:28:43 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id q20sm3048591wmj.5.2020.09.25.07.28.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Sep 2020 07:28:43 -0700 (PDT) Message-Id: In-Reply-To: References: From: "Johannes Schindelin via GitGitGadget" Date: Fri, 25 Sep 2020 14:28:32 +0000 Subject: [PATCH 04/10] cmake: fall back to using `vcpkg`'s `msgfmt.exe` on Windows Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Sibi Siddharthan , =?utf-8?b?xJBvw6Bu?= =?utf-8?b?IFRy4bqnbiBDw7RuZw==?= Danh , SZEDER =?utf-8?b?R8OhYm9y?= , Johannes Schindelin , Johannes Schindelin Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Johannes Schindelin We are already relying on `vcpkg` to manage our dependencies, including `libiconv`. Let's also use the `msgfmt.exe` from there. Signed-off-by: Johannes Schindelin --- contrib/buildsystems/CMakeLists.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/contrib/buildsystems/CMakeLists.txt b/contrib/buildsystems/CMakeLists.txt index 16014ac4f7..acb197fba5 100644 --- a/contrib/buildsystems/CMakeLists.txt +++ b/contrib/buildsystems/CMakeLists.txt @@ -155,7 +155,11 @@ endif() find_program(MSGFMT_EXE msgfmt) if(NOT MSGFMT_EXE) - message(WARNING "Text Translations won't be build") + set(MSGFMT_EXE ${CMAKE_SOURCE_DIR}/compat/vcbuild/vcpkg/downloads/tools/msys2/msys64/usr/bin/msgfmt.exe) + if(NOT EXISTS ${MSGFMT_EXE}) + message(WARNING "Text Translations won't be build") + unset(MSGFMT_EXE) + endif() endif() #Force all visual studio outputs to CMAKE_BINARY_DIR