From: Erwin Janssen <erwinjanssen@outlook.com>
Date: Tue, 11 Apr 2017 20:02:12 +0000 (+0200)
Subject: Add 64bit dependencies for lib/gvc
X-Git-Tag: 2.42.0~171^2~7
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=978ae764a7488402aeb8d5a92daed716421d7e05;p=graphviz

Add 64bit dependencies for lib/gvc

These dependencies had the following changes:
- rxspencer became a lib-only library
- libexpat became expat
- The 64bit version of ltdl required cygwin1.dll
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 65642ad57..63dc00f9d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -85,6 +85,9 @@ if (WIN32)
 
     # Find DLLs on Windows
     find_file(EXPAT_RUNTIME_LIBRARIES NAMES libexpat.dll expat.dll)
+    if (CMAKE_CL_64)
+        find_file(MSYS_RUNTIME_LIBRARIES NAMES msys-2.0.dll)
+    endif()
 endif()
 
 # ============================ Set Graphviz version ============================
diff --git a/cmake/FindRxSpencer.cmake b/cmake/FindRxSpencer.cmake
index 2a4df12f3..d53419173 100644
--- a/cmake/FindRxSpencer.cmake
+++ b/cmake/FindRxSpencer.cmake
@@ -1,20 +1,16 @@
 find_path(RXSPENCER_INCLUDE_DIR regex.h)
 find_library(RXSPENCER_LIBRARY NAMES rxspencer)
-find_file(RXSPENCER_RUNTIME_LIBRARY rxspencer.dll)
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(RXSPENCER DEFAULT_MSG
     RXSPENCER_LIBRARY
     RXSPENCER_INCLUDE_DIR
-    RXSPENCER_RUNTIME_LIBRARY
 )
 
 mark_as_advanced(
     RXSPENCER_INCLUDE_DIR
     RXSPENCER_LIBRARY
-    RXSPENCER_RUNTIME_LIBRARY
 )
 
 set(RXSPENCER_INCLUDE_DIRS ${RXSPENCER_INCLUDE_DIR})
 set(RXSPENCER_LIBRARIES ${RXSPENCER_LIBRARY})
-set(RXSPENCER_RUNTIME_LIBRARIES ${RXSPENCER_RUNTIME_LIBRARY})
diff --git a/cmd/tools/graphml2gv.vcxproj b/cmd/tools/graphml2gv.vcxproj
index 4313f400a..10d7e29b6 100644
--- a/cmd/tools/graphml2gv.vcxproj
+++ b/cmd/tools/graphml2gv.vcxproj
@@ -69,10 +69,10 @@
       <SubSystem>Console</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
       <AdditionalLibraryDirectories>$(OutDir);$(SolutionDir)windows\getopt;$(SolutionDir)windows\dependencies\libraries\x86\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>getopt.lib;cdt.lib;cgraph.lib;ingraphs.lib;gvc.lib;libexpat.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>getopt.lib;cdt.lib;cgraph.lib;ingraphs.lib;gvc.lib;expat.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PostBuildEvent>
-      <Command>copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libexpat.dll $(OutDir)libexpat.dll</Command>
+      <Command>copy $(SolutionDir)windows\dependencies\libraries\x86\bin\expat.dll $(OutDir)expat.dll</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -92,10 +92,10 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <TargetMachine>MachineX86</TargetMachine>
       <AdditionalLibraryDirectories>$(OutDir);$(SolutionDir)windows\getopt;$(SolutionDir)windows\dependencies\libraries\x86\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>getopt.lib;cdt.lib;cgraph.lib;ingraphs.lib;gvc.lib;libexpat.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>getopt.lib;cdt.lib;cgraph.lib;ingraphs.lib;gvc.lib;expat.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PostBuildEvent>
-      <Command>copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libexpat.dll $(OutDir)libexpat.dll</Command>
+      <Command>copy $(SolutionDir)windows\dependencies\libraries\x86\bin\expat.dll $(OutDir)expat.dll</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
diff --git a/cmd/tools/gxl2gv.vcxproj b/cmd/tools/gxl2gv.vcxproj
index 1d6ae46fe..756c07815 100644
--- a/cmd/tools/gxl2gv.vcxproj
+++ b/cmd/tools/gxl2gv.vcxproj
@@ -70,10 +70,10 @@
       <SubSystem>Console</SubSystem>
       <DataExecutionPrevention />
       <TargetMachine>MachineX86</TargetMachine>
-      <AdditionalDependencies>getopt.lib;cdt.lib;cgraph.lib;ingraphs.lib;gvc.lib;libexpat.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>getopt.lib;cdt.lib;cgraph.lib;ingraphs.lib;gvc.lib;expat.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PostBuildEvent>
-      <Command>copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libexpat.dll $(OutDir)libexpat.dll</Command>
+      <Command>copy $(SolutionDir)windows\dependencies\libraries\x86\bin\expat.dll $(OutDir)libexpat.dll</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -94,10 +94,10 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <DataExecutionPrevention />
       <TargetMachine>MachineX86</TargetMachine>
-      <AdditionalDependencies>getopt.lib;cdt.lib;cgraph.lib;ingraphs.lib;gvc.lib;libexpat.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>getopt.lib;cdt.lib;cgraph.lib;ingraphs.lib;gvc.lib;expat.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PostBuildEvent>
-      <Command>copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libexpat.dll $(OutDir)libexpat.dll</Command>
+      <Command>copy $(SolutionDir)windows\dependencies\libraries\x86\bin\expat.dll $(OutDir)libexpat.dll</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
diff --git a/lib/gvc.vcxproj b/lib/gvc.vcxproj
index c49065d3b..85d300b3f 100644
--- a/lib/gvc.vcxproj
+++ b/lib/gvc.vcxproj
@@ -69,7 +69,7 @@
       <DataExecutionPrevention />
       <TargetMachine>MachineX86</TargetMachine>
       <ModuleDefinitionFile>gvc.def</ModuleDefinitionFile>
-      <AdditionalDependencies>cdt.lib;cgraph.lib;ltdl.lib;xml2.lib;libexpat.lib;zlib.lib;rxspencer.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>cdt.lib;cgraph.lib;ltdl.lib;xml2.lib;expat.lib;zlib.lib;rxspencer.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PreBuildEvent>
       <Command>bison -dy common\htmlparse.y -o common\htmlparse-intermediate.c
@@ -84,8 +84,7 @@ awk -f $(SolutionDir)awk\colortbl.awk color_lib &gt; common\colortbl.h</Command>
     </PreBuildEvent>
     <PostBuildEvent>
       <Command>copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libltdl3.dll $(OutDir)libltdl3.dll
-copy $(SolutionDir)windows\dependencies\libraries\x86\bin\rxspencer.dll $(OutDir)rxspencer.dll
-copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libexpat.dll $(OutDir)libexpat.dll</Command>
+copy $(SolutionDir)windows\dependencies\libraries\x86\bin\expat.dll $(OutDir)expat.dll</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -107,7 +106,7 @@ copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libexpat.dll $(OutDir)
       <DataExecutionPrevention />
       <TargetMachine>MachineX86</TargetMachine>
       <ModuleDefinitionFile>gvc.def</ModuleDefinitionFile>
-      <AdditionalDependencies>cdt.lib;cgraph.lib;ltdl.lib;xml2.lib;libexpat.lib;zlib.lib;rxspencer.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>cdt.lib;cgraph.lib;ltdl.lib;xml2.lib;expat.lib;zlib.lib;rxspencer.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PreBuildEvent>
       <Command>bison -dy common\htmlparse.y -o common\htmlparse-intermediate.c
@@ -122,8 +121,7 @@ awk -f $(SolutionDir)awk\colortbl.awk color_lib &gt; common\colortbl.h</Command>
     </PreBuildEvent>
     <PostBuildEvent>
       <Command>copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libltdl3.dll $(OutDir)libltdl3.dll
-copy $(SolutionDir)windows\dependencies\libraries\x86\bin\rxspencer.dll $(OutDir)rxspencer.dll
-copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libexpat.dll $(OutDir)libexpat.dll</Command>
+copy $(SolutionDir)windows\dependencies\libraries\x86\bin\expat.dll $(OutDir)expat.dll</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
@@ -237,4 +235,4 @@ copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libexpat.dll $(OutDir)
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/lib/gvc/CMakeLists.txt b/lib/gvc/CMakeLists.txt
index 68f894e6d..a853ba3b0 100644
--- a/lib/gvc/CMakeLists.txt
+++ b/lib/gvc/CMakeLists.txt
@@ -108,7 +108,15 @@ if (WIN32)
         FILES
             ${EXPAT_RUNTIME_LIBRARIES}
             ${LTDL_RUNTIME_LIBRARIES}
-            ${RXSPENCER_RUNTIME_LIBRARIES}
         DESTINATION ${BINARY_INSTALL_DIR}
     )
+    # Include msys runtime when compiling 64bit on Windows, required for the
+    # 64bit version of libltdl. TODO: replace ltdl with a different dynamic
+    # loader, or find a 64bit version that doesn't need msys.
+    if (CMAKE_CL_64)
+        install(
+            FILES ${MSYS_RUNTIME_LIBRARIES}
+            DESTINATION ${BINARY_INSTALL_DIR}
+        )
+    endif()
 endif()
diff --git a/windows/dependencies/libraries b/windows/dependencies/libraries
index 2263df725..77fda0835 160000
--- a/windows/dependencies/libraries
+++ b/windows/dependencies/libraries
@@ -1 +1 @@
-Subproject commit 2263df7255f0d8bc80d39f3f5da2c82764c10783
+Subproject commit 77fda08357b2d39eb9285f37feebde123759ff5a