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 <rkitover@gmail.com>
This commit is contained in:
parent
378c9493e9
commit
84d406ac0e
|
@ -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)
|
||||
|
|
Loading…
Reference in New Issue