From 0fe1d7d81d472f463de7e5e041e3ec14d31127e9 Mon Sep 17 00:00:00 2001 From: Leonardo Di Donato Date: Mon, 20 Jan 2020 20:37:08 +0000 Subject: [PATCH] fix(cmake/modules): enforce bundled openssl for sinsp when USE_BUNDLED_DEPS is true Signed-off-by: Leonardo Di Donato --- cmake/modules/sysdig.cmake | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/cmake/modules/sysdig.cmake b/cmake/modules/sysdig.cmake index fca1c35e..57c2e87b 100644 --- a/cmake/modules/sysdig.cmake +++ b/cmake/modules/sysdig.cmake @@ -14,6 +14,12 @@ set(SYSDIG_CMAKE_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/sysdig-repo") set(SYSDIG_CMAKE_WORKING_DIR "${CMAKE_BINARY_DIR}/sysdig-repo") +# this needs to be here at the top +if(USE_BUNDLED_DEPS) + # explicitly force this dependency to use the system OpenSSL + set(USE_BUNDLED_OPENSSL ON) +endif() + file(MAKE_DIRECTORY ${SYSDIG_CMAKE_WORKING_DIR}) # cd /path/to/build && cmake /path/to/source execute_process(COMMAND "${CMAKE_COMMAND}" ${SYSDIG_CMAKE_SOURCE_DIR} WORKING_DIRECTORY ${SYSDIG_CMAKE_WORKING_DIR}) @@ -48,6 +54,4 @@ set(CREATE_TEST_TARGETS OFF) if(USE_BUNDLED_DEPS) add_dependencies(scap grpc curl jq) - # explicitly force this dependency to use the system OpenSSL - set(USE_BUNDLED_OPENSSL ON) endif()