From 4d29b872ab25386ffced314a12f53cb8479c0c8e Mon Sep 17 00:00:00 2001 From: Luca Guerra Date: Mon, 28 Feb 2022 15:48:44 +0000 Subject: [PATCH] fix(build): fix civetweb linking in cmake module Signed-off-by: Luca Guerra Co-authored-by: Federico Di Pierro --- cmake/modules/civetweb.cmake | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cmake/modules/civetweb.cmake b/cmake/modules/civetweb.cmake index ea1226e7659..31ba6745352 100644 --- a/cmake/modules/civetweb.cmake +++ b/cmake/modules/civetweb.cmake @@ -12,8 +12,8 @@ # set(CIVETWEB_SRC "${PROJECT_BINARY_DIR}/civetweb-prefix/src/civetweb/") -set(CIVETWEB_LIB "${CIVETWEB_SRC}/install/${CMAKE_INSTALL_LIBDIR}/libcivetweb.a") -SET(CIVETWEB_CPP_LIB "${CIVETWEB_SRC}/install/${CMAKE_INSTALL_LIBDIR}/libcivetweb-cpp.a") +set(CIVETWEB_LIB "${CIVETWEB_SRC}/install/lib/libcivetweb.a") +SET(CIVETWEB_CPP_LIB "${CIVETWEB_SRC}/install/lib/libcivetweb-cpp.a") set(CIVETWEB_INCLUDE_DIR "${CIVETWEB_SRC}/install/include") message(STATUS "Using bundled civetweb in '${CIVETWEB_SRC}'") if (USE_BUNDLED_OPENSSL) @@ -25,6 +25,7 @@ if (USE_BUNDLED_OPENSSL) INSTALL_DIR ${CIVETWEB_SRC}/install CMAKE_ARGS -DBUILD_TESTING=off + -DCMAKE_INSTALL_LIBDIR=lib -DCIVETWEB_BUILD_TESTING=off -DCIVETWEB_ENABLE_CXX=on -DCIVETWEB_ENABLE_SERVER_EXECUTABLE=off