github/falco
1
0
Fork 0
mirror of https://github.com/falcosecurity/falco.git synced 2025-07-18 16:51:30 +00:00
Code Issues Projects Releases Wiki Activity

update(build): dropped civetweb patch. Use different ExternalProject_Add when building with bundled openssl or not, to avoid depending on an unexhistent target.

Browse Source 
Signed-off-by: Federico Di Pierro <nierro92@gmail.com>
This commit is contained in:
Federico Di Pierro 2021-11-12 14:26:06 +01:00 committed by poiana
parent f3c3de7e05
commit 5e6f30109e
2 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
cmake/modules/civetweb.cmake
View File

@ -16,21 +16,37 @@ set(CIVETWEB_LIB "${CIVETWEB_SRC}/install/lib/libcivetweb.a")
SET(CIVETWEB_CPP_LIB "${CIVETWEB_SRC}/install/lib/libcivetweb-cpp.a") SET(CIVETWEB_CPP_LIB "${CIVETWEB_SRC}/install/lib/libcivetweb-cpp.a")
set(CIVETWEB_INCLUDE_DIR "${CIVETWEB_SRC}/install/include") set(CIVETWEB_INCLUDE_DIR "${CIVETWEB_SRC}/install/include")
message(STATUS "Using bundled civetweb in '${CIVETWEB_SRC}'") message(STATUS "Using bundled civetweb in '${CIVETWEB_SRC}'")
ExternalProject_Add( if (USE_BUNDLED_OPENSSL)
civetweb ExternalProject_Add(
DEPENDS openssl civetweb
URL "https://github.com/civetweb/civetweb/archive/v1.15.tar.gz" DEPENDS openssl
URL_HASH "SHA256=90a533422944ab327a4fbb9969f0845d0dba05354f9cacce3a5005fa59f593b9" URL "https://github.com/civetweb/civetweb/archive/v1.15.tar.gz"
INSTALL_DIR ${CIVETWEB_SRC}/install URL_HASH "SHA256=90a533422944ab327a4fbb9969f0845d0dba05354f9cacce3a5005fa59f593b9"
CMAKE_ARGS INSTALL_DIR ${CIVETWEB_SRC}/install
-DBUILD_TESTING=off CMAKE_ARGS
-DCIVETWEB_BUILD_TESTING=off -DBUILD_TESTING=off
-DCIVETWEB_ENABLE_CXX=on -DCIVETWEB_BUILD_TESTING=off
-DCIVETWEB_ENABLE_SERVER_EXECUTABLE=off -DCIVETWEB_ENABLE_CXX=on
-DCIVETWEB_ENABLE_SSL_DYNAMIC_LOADING=off -DCIVETWEB_ENABLE_SERVER_EXECUTABLE=off
-DCIVETWEB_SERVE_NO_FILES=on -DCIVETWEB_ENABLE_SSL_DYNAMIC_LOADING=off
-DCMAKE_INSTALL_PREFIX=${CIVETWEB_SRC}/install -DCIVETWEB_SERVE_NO_FILES=on
-DOPENSSL_INCLUDE_DIR=${OPENSSL_INCLUDE_DIR} -DCMAKE_INSTALL_PREFIX=${CIVETWEB_SRC}/install
-DOPENSSL_LIBRARIES=${OPENSSL_LIBRARIES} -DOPENSSL_ROOT_DIR:PATH=${OPENSSL_INSTALL_DIR}
BUILD_BYPRODUCTS ${CIVETWEB_LIB} ${CIVETWEB_CPP_LIB} -DOPENSSL_USE_STATIC_LIBS:BOOL=TRUE
PATCH_COMMAND patch -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/civetweb/patch/civetweb.patch) BUILD_BYPRODUCTS ${CIVETWEB_LIB} ${CIVETWEB_CPP_LIB})
else()
ExternalProject_Add(
civetweb
URL "https://github.com/civetweb/civetweb/archive/v1.15.tar.gz"
URL_HASH "SHA256=90a533422944ab327a4fbb9969f0845d0dba05354f9cacce3a5005fa59f593b9"
INSTALL_DIR ${CIVETWEB_SRC}/install
CMAKE_ARGS
-DBUILD_TESTING=off
-DCIVETWEB_BUILD_TESTING=off
-DCIVETWEB_ENABLE_CXX=on
-DCIVETWEB_ENABLE_SERVER_EXECUTABLE=off
-DCIVETWEB_ENABLE_SSL_DYNAMIC_LOADING=off
-DCIVETWEB_SERVE_NO_FILES=on
-DCMAKE_INSTALL_PREFIX=${CIVETWEB_SRC}/install
BUILD_BYPRODUCTS ${CIVETWEB_LIB} ${CIVETWEB_CPP_LIB})
endif()

16
cmake/modules/civetweb/patch/civetweb.patch
View File

@ -1,16 +0,0 @@
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 43f3a77e..92664b79 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -53,7 +53,10 @@ if (CIVETWEB_ENABLE_SSL)
target_link_libraries(civetweb-c-library -ldl)
endif()
else()
- find_package(OpenSSL)
+ # Let it use our own provided openssl
+ if (NOT OPENSSL_INCLUDE_DIR)
+ find_package(OpenSSL)
+ endif()
include_directories(${OPENSSL_INCLUDE_DIR})
message(STATUS "OpenSSL include directory: ${OPENSSL_INCLUDE_DIR}")
target_link_libraries(civetweb-c-library ${OPENSSL_LIBRARIES})