CMake: ensure Cairo is found on MinGW

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 025052bc853323d04483e56a7be0d402fb12f08b..52a0281aa337659fbc2cffff826427cf6b4aadf6 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -94,6 +94,9 @@ if(WIN32)
         list(APPEND CMAKE_PREFIX_PATH ${WINDOWS_DEPENDENCY_DIR})
         list(APPEND CMAKE_PREFIX_PATH ${WINDOWS_DEPENDENCY_VCPKG_DIR})
     endif()
+    if(MINGW)
+        list(APPEND CMAKE_PREFIX_PATH $ENV{MSYSTEM_PREFIX})
+    endif()
 endif()
 
 find_package(ANN)

diff --git a/cmake/FindCairo.cmake b/cmake/FindCairo.cmake
index a44f8682fe0cd0b96ee08bc6f114224d6962df6e..b4cfd10221d38405f1f9a154d12f0028034c3c77 100644 (file)
--- a/cmake/FindCairo.cmake
+++ b/cmake/FindCairo.cmake
@@ -5,10 +5,10 @@ if(WIN32)
 
     find_library(Cairo_LIBRARY NAMES cairo)
 
-    find_program(Cairo_RUNTIME_LIBRARY NAMES cairo.dll)
-    find_program(EXPAT_RUNTIME_LIBRARY NAMES expat.dll)
-    find_program(FONTCONFIG_RUNTIME_LIBRARY NAMES fontconfig.dll)
-    find_program(PIXMAN_RUNTIME_LIBRARY NAMES pixman-1.dll)
+    find_program(Cairo_RUNTIME_LIBRARY NAMES cairo.dll libcairo-2.dll)
+    find_program(EXPAT_RUNTIME_LIBRARY NAMES expat.dll libexpat-1.dll)
+    find_program(FONTCONFIG_RUNTIME_LIBRARY NAMES fontconfig.dll libfontconfig-1.dll)
+    find_program(PIXMAN_RUNTIME_LIBRARY NAMES pixman-1.dll libpixman-1-0.dll)
 
     find_package_handle_standard_args(Cairo DEFAULT_MSG
         Cairo_INCLUDE_DIR