Skip to content
This repository was archived by the owner on Jul 4, 2025. It is now read-only.

Commit bbe40dc

Browse files
committed
chore: cmake
1 parent 7609c3f commit bbe40dc

File tree

3 files changed

+13
-7
lines changed

3 files changed

+13
-7
lines changed

engine/CMakeLists.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,7 @@ endif()
9898

9999
add_subdirectory(cli)
100100

101-
set(OPENSSL_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/../build_deps/openssl)
102-
set(OPENSSL_INCLUDE_DIR ${OPENSSL_INSTALL_DIR}/include)
103-
set(OPENSSL_ROOT_DIR ${OPENSSL_INSTALL_DIR}/lib64)
101+
# set(OPENSSL_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/../build_deps/openssl)
104102

105103
if(CMAKE_BUILD_INJA_TEST)
106104
add_subdirectory(examples/inja)

engine/cmake/curl.cmake

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
include(FetchContent)
22

3-
set(CURL_USE_LIBPSL OFF)
4-
set(BUILD_EXAMPLES OFF)
53
FetchContent_Declare(curl
64
GIT_REPOSITORY https://github.com/curl/curl.git
75
GIT_TAG curl-8_12_1
86
)
97

10-
FetchContent_MakeAvailable(curl)
8+
FetchContent_MakeAvailableWithArgs(curl
9+
CURL_USE_LIBPSL=OFF
10+
BUILD_EXAMPLES=OFF
11+
OPENSSL_ROOT_DIR=${CMAKE_CURRENT_BINARY_DIR}/../build_deps/openssl/lib64
12+
OPENSSL_INCLUDE_DIR=${CMAKE_CURRENT_BINARY_DIR}/../build_deps/openssl/include/openssl
13+
)

engine/cmake/drogon.cmake

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ include(FetchContent)
22

33
set(USE_OSSP_UUID TRUE)
44

5+
56
set(ZLIB_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/../build_deps/zlib/install)
67
set(ZLIB_INCLUDE_DIR ${ZLIB_INSTALL_DIR}/include)
78
if(MSVC)
@@ -40,4 +41,8 @@ FetchContent_Declare(drogon
4041
GIT_TAG v1.9.10
4142
)
4243

43-
FetchContent_MakeAvailableWithArgs(drogon BUILD_CTL=OFF)
44+
FetchContent_MakeAvailableWithArgs(drogon
45+
BUILD_CTL=OFF
46+
OPENSSL_ROOT_DIR=${CMAKE_CURRENT_BINARY_DIR}/../build_deps/openssl/lib64
47+
OPENSSL_INCLUDE_DIR=${CMAKE_CURRENT_BINARY_DIR}/../build_deps/openssl/include/openssl
48+
)

0 commit comments

Comments
 (0)