From: Magnus Jacobsson <Magnus.Jacobsson@berotec.se>
Date: Thu, 5 Aug 2021 07:36:20 +0000 (+0200)
Subject: CMake: fix expat runtime library not found by cpack on msys2
X-Git-Tag: 2.49.1~51^2~8
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9e232d188cb579df403ee638c2b163a8a139287f;p=graphviz

CMake: fix expat runtime library not found by cpack on msys2

Fixes these errors with MinGW:

CMake Error at C:/Users/magja/graphviz/build/lib/gvc/cmake_install.cmake:75 (file):
  file INSTALL cannot find
  "C:/Users/magja/graphviz/lib/gvc/EXPAT_RUNTIME_LIBRARIES-NOTFOUND": No
  error.
Call Stack (most recent call first):
  C:/Users/magja/graphviz/build/lib/cmake_install.cmake:70 (include)
  C:/Users/magja/graphviz/build/cmake_install.cmake:58 (include)

CMake Error at C:/Users/magja/graphviz/build/cmd/tools/cmake_install.cmake:269 (file):
  file INSTALL cannot find
  "C:/Users/magja/graphviz/cmd/tools/EXPAT_RUNTIME_LIBRARIES-NOTFOUND": No
  error.
Call Stack (most recent call first):
  C:/Users/magja/graphviz/build/cmd/cmake_install.cmake:44 (include)
  C:/Users/magja/graphviz/build/cmake_install.cmake:60 (include)

CPack Error: Error when generating package: Graphviz
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 37f0d27fa..34959b746 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -114,7 +114,7 @@ if (WIN32)
     # Find Windows specific dependencies
 
     # Find DLLs on Windows
-    find_program(EXPAT_RUNTIME_LIBRARIES NAMES libexpat.dll expat.dll)
+    find_program(EXPAT_RUNTIME_LIBRARIES NAMES libexpat.dll expat.dll msys-expat-1.dll)
     if (CMAKE_CL_64)
         find_program(MSYS_RUNTIME_LIBRARIES NAMES msys-2.0.dll)
     endif()