From 84d406ac0ece2eb574362693b03317d35ec87a6f Mon Sep 17 00:00:00 2001 From: Rafael Kitover Date: Thu, 20 Aug 2020 23:28:42 +0000 Subject: [PATCH] Temporary fix for wxrc on MSVC/vcpkg builds. When the wxrc installed by vcpkg into tools was made with the non-static wxWidgets, and the build is static, it will not find the wxWidgets dlls and fail. Use our own wxrc.exe from the dependencies submodule for the time being. This is a temporary fix, a proper fix would be adding the dlls, if they are installed, to the PATH. Signed-off-by: Rafael Kitover --- src/wx/CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/wx/CMakeLists.txt b/src/wx/CMakeLists.txt index eee78729..4862fef2 100644 --- a/src/wx/CMakeLists.txt +++ b/src/wx/CMakeLists.txt @@ -163,11 +163,13 @@ if(WIN32 AND CMAKE_TOOLCHAIN_FILE MATCHES vcpkg AND (X86_32 OR AMD64)) ) endif() - if(DEFINED ENV{APPVEYOR}) +# if(DEFINED ENV{APPVEYOR}) + if(TRUE) # For some reason, the vcpkg built wxrc fails on appveyor. set(WXRC ${CMAKE_SOURCE_DIR}/dependencies/wxrc.exe) else() set(WXRC ${common_prefix}/tools/wxwidgets/wxrc.exe) + # This one sometimes fails to find its dlls. endif() if(NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/zip.exe)