summaryrefslogtreecommitdiff
path: root/expat
diff options
context:
space:
mode:
authorSebastian Pipping <sebastian@pipping.org>2022-09-08 13:34:01 +0200
committerSebastian Pipping <sebastian@pipping.org>2022-09-09 01:46:33 +0200
commit80e6c69140c15e2caa4d808de0d35c8d5aaab415 (patch)
treeb4a24c981bc29402c671d36460cf055c9527f9f2 /expat
parent9d246a722576be37d6880a63782dab30132d423e (diff)
downloadlibexpat-git-80e6c69140c15e2caa4d808de0d35c8d5aaab415.tar.gz
cmake: Avoid error "windres: Command not found" with MinGW on Ubuntu 20.04
Related: https://gitlab.kitware.com/cmake/cmake/-/issues/20500#note_720469
Diffstat (limited to 'expat')
-rw-r--r--expat/Changes3
-rw-r--r--expat/cmake/mingw-toolchain.cmake1
2 files changed, 4 insertions, 0 deletions
diff --git a/expat/Changes b/expat/Changes
index 025f0bb5..86f5ec60 100644
--- a/expat/Changes
+++ b/expat/Changes
@@ -20,6 +20,9 @@ Release x.x.x xxx xxxxx xx xxxx
#622 #624 MinGW|CMake: Sync library name with GNU Autotools,
i.e. produce libexpat-1.dll rather than libexpat.dll
by default. Filename libexpat.dll.a is unaffected.
+ #632 MinGW|CMake: Set missing variable CMAKE_RC_COMPILER in
+ toolchain file "cmake/mingw-toolchain.cmake" to avoid
+ error "windres: Command not found" on e.g. Ubuntu 20.04
#620 CMake: Make documentation on variables a bit more consistent
#610 Address Cppcheck 2.8.1 warning
diff --git a/expat/cmake/mingw-toolchain.cmake b/expat/cmake/mingw-toolchain.cmake
index 31a238b0..9032d9e5 100644
--- a/expat/cmake/mingw-toolchain.cmake
+++ b/expat/cmake/mingw-toolchain.cmake
@@ -31,6 +31,7 @@ set(CMAKE_SYSTEM_NAME Windows)
set(CMAKE_C_COMPILER i686-w64-mingw32-gcc)
set(CMAKE_CXX_COMPILER i686-w64-mingw32-g++)
+set(CMAKE_RC_COMPILER i686-w64-mingw32-windres)
set(WIN32 ON)
set(MINGW ON)