]> granicus.if.org Git - graphviz/commitdiff
CMake: fix expat runtime library not found by cpack on msys2
authorMagnus Jacobsson <Magnus.Jacobsson@berotec.se>
Thu, 5 Aug 2021 07:36:20 +0000 (09:36 +0200)
committerMagnus Jacobsson <Magnus.Jacobsson@berotec.se>
Tue, 31 Aug 2021 13:54:08 +0000 (15:54 +0200)
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

CMakeLists.txt

index 37f0d27fa38f92315c00c8b8249416a48f3a7fd4..34959b746fc815d9438f7e8b5c1bd7cc9eb8de16 100644 (file)
@@ -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()