Commit 978ae764 authored by Erwin Janssen's avatar Erwin Janssen

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
parent b1a5af2d
......@@ -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 ============================
......
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})
......@@ -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>
......
......@@ -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>
......
......@@ -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
......@@ -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()
Subproject commit 2263df7255f0d8bc80d39f3f5da2c82764c10783
Subproject commit 77fda08357b2d39eb9285f37feebde123759ff5a
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment