diff options
| author | Gerald Combs <gerald@wireshark.org> | 2022-04-27 14:16:58 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2022-04-27 22:01:17 +0000 |
| commit | 52db7e88bc743fd9f91a320369092c0f3785b7e7 (patch) | |
| tree | 78d562b471b84eca8e6a8016be6506cda56cc324 /cmake/modules | |
| parent | 0f695875ac75e05558328aa9ed83923ec56c3a1d (diff) | |
Falco Bridge: Fix building on Windows.
Fix Falco plugin installation in multi-config environments. Fix FindSinsp
on Windows. Ignore a couple of warnings for now.
Diffstat (limited to 'cmake/modules')
| -rw-r--r-- | cmake/modules/FindSinsp.cmake | 28 |
1 files changed, 20 insertions, 8 deletions
diff --git a/cmake/modules/FindSinsp.cmake b/cmake/modules/FindSinsp.cmake index 4b6699ae5e..da430c4a82 100644 --- a/cmake/modules/FindSinsp.cmake +++ b/cmake/modules/FindSinsp.cmake @@ -39,10 +39,13 @@ find_path(SINSP_PLUGIN_DIR HINTS "${SINSP_PLUGINDIR}" ) +# https://github.com/falcosecurity/libs doesn't yet have any official releases +# or tags. Add RelWithDebInfo to our sinsp and scap path suffixes so that we +# can find what we need in a local build. find_library(SINSP_LIBRARY NAMES sinsp HINTS "${SINSP_LIBDIR}" "${SINSP_HINTS}/lib" - PATH_SUFFIXES libsinsp + PATH_SUFFIXES libsinsp libsinsp/RelWithDebInfo PATHS /usr/lib /usr/local/lib @@ -51,7 +54,7 @@ find_library(SINSP_LIBRARY find_library(SCAP_LIBRARY NAMES scap HINTS "${SINSP_LIBDIR}" "${SINSP_HINTS}/lib" - PATH_SUFFIXES libscap + PATH_SUFFIXES libscap libscap/RelWithDebInfo PATHS /usr/lib /usr/local/lib @@ -60,6 +63,7 @@ find_library(SCAP_LIBRARY find_path(JSON_INCLUDE_DIR NAMES json/json.h HINTS "${SINSP_INCLUDEDIR}" "${SINSP_HINTS}/include" + PATH_SUFFIXES userspace/libsinsp/third-party/jsoncpp /usr/include /usr/include/jsoncpp /usr/local/include @@ -106,19 +110,27 @@ find_package_handle_standard_args(Sinsp REQUIRED_VARS SINSP_LIBRARY SINSP_INCLUDE_DIR SCAP_LIBRARY SCAP_INCLUDE_DIR - JSONCPP_LIBRARY JSON_INCLUDE_DIR - TBB_LIBRARY TBB_INCLUDE_DIR + JSON_INCLUDE_DIR SINSP_PLUGIN_DIR # VERSION_VAR SINSP_VERSION ) if( SINSP_FOUND ) - set( SINSP_INCLUDE_DIRS ${SINSP_INCLUDE_DIR} ${SCAP_INCLUDE_DIR} ${JSON_INCLUDE_DIR} ${TBB_INCLUDE_DIR} ) - set( SINSP_LIBRARIES ${SINSP_LIBRARY} ${SCAP_LIBRARY} ${JSONCPP_LIBRARY} ${TBB_LIBRARY} ) + set(SINSP_INCLUDE_DIRS ${SINSP_INCLUDE_DIR} ${SCAP_INCLUDE_DIR} ${JSON_INCLUDE_DIR}) + if(TBB_INCLUDE_DIR) + list(APPEND SINSP_INCLUDE_DIRS ${TBB_INCLUDE_DIR}) + endif() + set(SINSP_LIBRARIES ${SINSP_LIBRARY} ${SCAP_LIBRARY}) + if (JSONCPP_LIBRARY) + list(APPEND SINSP_LIBRARIES ${JSONCPP_LIBRARY}) + endif() + if (TBB_LIBRARY) + list(APPEND SINSP_LIBRARIES ${TBB_LIBRARY}) + endif() if (WIN32) - set( SINSP_PLUGINS ${SINSP_PLUGIN_DIR}/plugins/cloudtrail/cloudtrail.dll ) + set(SINSP_PLUGINS ${SINSP_PLUGIN_DIR}/plugins/cloudtrail/cloudtrail.dll) else() - set( SINSP_PLUGINS ${SINSP_PLUGIN_DIR}/plugins/cloudtrail/libcloudtrail.so ) + set(SINSP_PLUGINS ${SINSP_PLUGIN_DIR}/plugins/cloudtrail/libcloudtrail.so) endif() # if (WIN32) # set ( SINSP_DLL_DIR "${SINSP_HINTS}/bin" |