gv2gml: also link to libgvc

Upcoming changes will make use of some functionality from libcommon, which is
consolidated into libgvc.

Related to #1276.

diff --git a/cmd/tools/CMakeLists.txt b/cmd/tools/CMakeLists.txt
index 172d94b365a11e02d2e28633f79197e4c10ac271..412a386943be9c2dbc1130f3b81eb3e8dd627f40 100644 (file)
--- a/cmd/tools/CMakeLists.txt
+++ b/cmd/tools/CMakeLists.txt
@@ -140,7 +140,7 @@ target_include_directories(gv2gml PRIVATE
     ${GRAPHVIZ_LIB_DIR}/gvc
     ${GRAPHVIZ_LIB_DIR}/pathplan
     ${Getopt_INCLUDE_DIRS})
-target_link_libraries(gv2gml cgraph ingraphs)
+target_link_libraries(gv2gml cgraph gvc ingraphs)
 if(NOT HAVE_GETOPT_H)
     target_link_libraries(gv2gml ${Getopt_LINK_LIBRARIES})
 endif(NOT HAVE_GETOPT_H)

diff --git a/cmd/tools/Makefile.am b/cmd/tools/Makefile.am
index 966bb86f5f8cb84c2a97ccc387ccf653ef414684..5a293619b3f956264d39a61c9c30ec99356673a3 100644 (file)
--- a/cmd/tools/Makefile.am
+++ b/cmd/tools/Makefile.am
@@ -303,6 +303,7 @@ endif
 gv2gml_SOURCES = gv2gml.c
 
 gv2gml_LDADD = \
+       $(top_builddir)/lib/gvc/libgvc.la \
        $(top_builddir)/lib/ingraphs/libingraphs_C.la \
        $(top_builddir)/lib/cgraph/libcgraph.la
 

diff --git a/cmd/tools/gv2gml.vcxproj b/cmd/tools/gv2gml.vcxproj
index 44fe2b2d76007b3bd0127e4a6de9b131e35ea5dc..562367d9f9154d81e494ba288db0dfd5e6f6d423 100644 (file)
--- a/cmd/tools/gv2gml.vcxproj
+++ b/cmd/tools/gv2gml.vcxproj
@@ -69,7 +69,7 @@
       <SubSystem>Console</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
       <AdditionalLibraryDirectories>$(OutDir);$(SolutionDir)windows\dependencies\libraries\vcpkg\installed\x86-windows\lib</AdditionalLibraryDirectories>
-      <AdditionalDependencies>getopt.lib;cdt.lib;cgraph.lib;ingraphs.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>getopt.lib;cdt.lib;cgraph.lib;gvc.lib;ingraphs.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PostBuildEvent>
       <Command>copy $(SolutionDir)windows\dependencies\libraries\vcpkg\installed\x86-windows\bin\getopt.dll $(OutDir)getopt.dll</Command>
@@ -91,7 +91,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <TargetMachine>MachineX86</TargetMachine>
       <AdditionalLibraryDirectories>$(OutDir);$(SolutionDir)windows\dependencies\libraries\vcpkg\installed\x86-windows\lib</AdditionalLibraryDirectories>
-      <AdditionalDependencies>getopt.lib;cdt.lib;cgraph.lib;ingraphs.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>getopt.lib;cdt.lib;cgraph.lib;gvc.lib;ingraphs.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PostBuildEvent>
       <Command>copy $(SolutionDir)windows\dependencies\libraries\vcpkg\installed\x86-windows\bin\getopt.dll $(OutDir)getopt.dll</Command>