Try to fix LIBNGHTTP2 link failure

Ettercap · Jul 29, 2020 · 49973f6 · 49973f6
1 parent 3f7f2c4
commit 49973f6
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/bundled_deps/curl/CMakeLists.txt b/bundled_deps/curl/CMakeLists.txt
@@ -63,7 +63,7 @@ set(EXPORT_CC ${CMAKE_C_COMPILER})
 # and the like.
 set(EXPORT_C_FLAGS ${CMAKE_C_FLAGS} -fPIC)
 
-set(EXPORT_LD_FLAGS ${CMAKE_THREAD_LIBS_INIT} ${LIBNGHTTP2_LDFLAGS})
+set(EXPORT_LD_FLAGS ${CMAKE_THREAD_LIBS_INIT})
 
 if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
   set(EXPORT_C_FLAGS "${EXPORT_C_FLAGS} ${CMAKE_C_FLAGS_DEBUG}")

diff --git a/cmake/Modules/FindLIBNGHTTP2.cmake b/cmake/Modules/FindLIBNGHTTP2.cmake
@@ -7,11 +7,9 @@
 
 find_package(PkgConfig)
 include(FindPkgConfig)
-pkg_check_modules(PC_LIBNGHTTP2 libnghttp2)
-if(PC_LIBNGHTTP2_FOUND)
+pkg_check_modules(LIBNGHTTP2 libnghttp2)
+if(LIBNGHTTP2_FOUND)
   set(LIBNGHTTP2_FOUND TRUE)
-  set(LIBNGHTTP2_LDFLAGS ${PC_LIBNGHTTP2_LDFLGAS})
-  set(LIBNGHTTP2_LIBRARIES ${PC_LIBNGHTTP2_LIBRARIES})
 endif()
 
 include(FindPackageHandleStandardArgs)

diff --git a/plug-ins/CMakeLists.txt b/plug-ins/CMakeLists.txt
@@ -3,7 +3,7 @@ if(HAVE_PCRE)
     add_library(sslstrip MODULE sslstrip/sslstrip.c)
     include_directories(${CURL_INCLUDE_DIR} ${PCRE_INCLUDE_DIR})
     add_dependencies(sslstrip curl)
-    target_link_libraries(sslstrip ${CURL_LIBRARY} ${PCRE_LIBRARY})
+    target_link_libraries(sslstrip ${CURL_LIBRARY} ${PCRE_LIBRARY} ${LIBNGHTTP2_LIBRARIES})
     target_link_libraries(sslstrip lib_ettercap)
     set_target_properties(sslstrip PROPERTIES PREFIX "ec_")
     install(TARGETS sslstrip