Fix: add missing dependency to gvm_util within boreas (#662)

(cherry picked from commit ac14fa5) # Conflicts: # boreas/CMakeLists.txt
greenbone · Feb 17, 2022 · 17e12bb · 17e12bb
1 parent 2ec8a58
commit 17e12bb
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/boreas/CMakeLists.txt b/boreas/CMakeLists.txt
@@ -75,7 +75,16 @@ if (BUILD_SHARED)
   set_target_properties (gvm_boreas_shared PROPERTIES VERSION "${CPACK_PACKAGE_VERSION}")
   set_target_properties (gvm_boreas_shared PROPERTIES PUBLIC_HEADER "${HEADERS}")
 
+<<<<<<< HEAD
   target_link_libraries (gvm_boreas_shared LINK_PRIVATE ${GLIB_LDFLAGS} ${LINKER_HARDENING_FLAGS} ${CMAKE_THREAD_LIBS_INIT})
+=======
+  target_link_libraries (gvm_boreas_shared LINK_PRIVATE
+                         gvm_util_shared
+                         ${GLIB_LDFLAGS}
+                         ${LIBNET_LDFLAGS}
+                         ${LINKER_HARDENING_FLAGS}
+                         ${CMAKE_THREAD_LIBS_INIT})
+>>>>>>> ac14fa5 (Fix: add missing dependency to gvm_util within boreas (#662))
 endif (BUILD_SHARED)
 
 set (LIBGVM_BOREAS_NAME