github/falco
1
0
Fork 0
mirror of https://github.com/falcosecurity/falco.git synced 2025-08-07 09:13:57 +00:00
Code Issues Projects Releases Wiki Activity

chore(build): fix error using find_package with ExternalProject_Add

Browse Source 
Signed-off-by: Federico Aponte <federico.aponte@sysdig.com>
This commit is contained in:
Federico Aponte 2023-12-06 11:12:22 +01:00 committed by poiana
parent 5e17ba6c23
commit e427c800f3
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmake/modules/njson.cmake
View File

@ -16,6 +16,11 @@ if(USE_BUNDLED_NLOHMANN_JSON)
ExternalProject_Add(njson ExternalProject_Add(njson
URL "https://github.com/nlohmann/json/archive/v3.3.0.tar.gz" URL "https://github.com/nlohmann/json/archive/v3.3.0.tar.gz"
URL_HASH "SHA256=2fd1d207b4669a7843296c41d3b6ac5b23d00dec48dba507ba051d14564aa801" URL_HASH "SHA256=2fd1d207b4669a7843296c41d3b6ac5b23d00dec48dba507ba051d14564aa801"
CMAKE_ARGS -DCMAKE_BUILD_TYPE=Release -DJSON_BuildTests=OFF -DBUILD_TESTING=OFF CMAKE_ARGS -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${PROJECT_BINARY_DIR}/njson-prefix -DJSON_BuildTests=OFF -DBUILD_TESTING=OFF
) )
set(nlohmann_json_DIR ${PROJECT_BINARY_DIR}/njson-prefix/include)
else()
find_package(nlohmann_json CONFIG REQUIRED)
add_custom_target(njson)
endif() endif()

6
userspace/engine/CMakeLists.txt
View File

@ -11,8 +11,6 @@
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
# specific language governing permissions and limitations under the License. # specific language governing permissions and limitations under the License.
find_package(nlohmann_json CONFIG REQUIRED)
add_library(falco_engine STATIC add_library(falco_engine STATIC
falco_common.cpp falco_common.cpp
falco_engine.cpp falco_engine.cpp
@ -34,19 +32,19 @@ if (EMSCRIPTEN)
target_compile_options(falco_engine PRIVATE "-sDISABLE_EXCEPTION_CATCHING=0") target_compile_options(falco_engine PRIVATE "-sDISABLE_EXCEPTION_CATCHING=0")
endif() endif()
add_dependencies(falco_engine yamlcpp) add_dependencies(falco_engine yamlcpp njson)
target_include_directories(falco_engine target_include_directories(falco_engine
PUBLIC PUBLIC
${LIBSCAP_INCLUDE_DIRS} ${LIBSCAP_INCLUDE_DIRS}
${LIBSINSP_INCLUDE_DIRS} ${LIBSINSP_INCLUDE_DIRS}
${PROJECT_BINARY_DIR}/userspace/engine ${PROJECT_BINARY_DIR}/userspace/engine
${nlohmann_json_DIR}
${TBB_INCLUDE_DIR} ${TBB_INCLUDE_DIR}
${YAMLCPP_INCLUDE_DIR} ${YAMLCPP_INCLUDE_DIR}
) )
target_link_libraries(falco_engine target_link_libraries(falco_engine
nlohmann_json::nlohmann_json
${FALCO_SINSP_LIBRARY} ${FALCO_SINSP_LIBRARY}
${YAMLCPP_LIB} ${YAMLCPP_LIB}
) )