From: Russ Combs Date: Fri, 14 Nov 2014 18:56:02 +0000 (-0500) Subject: fixed cmake -ldl issue X-Git-Tag: 3.0.0-233~1220 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6d7ded2c0604efd1d6b2a40ccf26abbfa2c3cdd1;p=thirdparty%2Fsnort3.git fixed cmake -ldl issue --- diff --git a/ChangeLog b/ChangeLog index d3ad59d18..cda890b2b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -29,6 +29,7 @@ -- fix / redefine --dirty-pig - no shutdown flushes -- fixed pcre reload init -- refactored main init / reload code +-- fixed cmake -ldl issue 127 -- REG_TEST out logging tcp options for rebuilt packets to match snort bug diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 1ea174fd3..7b99b4c4e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -11,6 +11,7 @@ set(EXTERNAL_LIBRARIES ${DNET_LIBRARIES} ${CLANG_CXX_LIBRARY} ${CMAKE_THREAD_LIBS_INIT} # GCC says we must link to the threads library + ${CMAKE_DL_LIBS} CACHE INTERNAL "external libraries" FORCE ) @@ -124,7 +125,6 @@ target_link_libraries( snort ${STATIC_INSPECTOR_LIBRARIES} ${UNIT_TESTS_LIBRARIES} ${EXTERNAL_LIBRARIES} - ${CMAKE_DL_LIBS} ) add_subdirectory(actions)