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

Commit 7609c3f

Browse files
committed
chore: lib path
1 parent fd7b53a commit 7609c3f

File tree

4 files changed

+7
-24
lines changed

4 files changed

+7
-24
lines changed

engine/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,10 @@ 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)
104+
101105
if(CMAKE_BUILD_INJA_TEST)
102106
add_subdirectory(examples/inja)
103107
endif()

engine/cmake/curl.cmake

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,10 @@
11
include(FetchContent)
22

3-
# FetchContent_Declare(openssl
4-
# GIT_REPOSITORY https://github.com/openssl/openssl.git
5-
# GIT_TAG openssl-3.4.1
6-
# )
7-
8-
# FetchContent_MakeAvailable(openssl)
9-
10-
# set(OPENSSL_SSL_LIBRARY SSL)
11-
# set(OPENSSL_CRYPTO_LIBRARY Crypto)
12-
# set(OPENSSL_INCLUDE_DIR "${openssl_BINARY_DIR}/include" "${openssl_BINARY_DIR}")
13-
14-
# find_package(OpenSSL REQUIRED)
15-
# SET(OPENSSL_FOUND TRUE)
16-
set(OPENSSL_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/../build_deps/openssl)
17-
set(OPENSSL_INCLUDE_DIR ${OPENSSL_INSTALL_DIR}/include)
18-
set(OPENSSL_ROOT_DIR ${OPENSSL_INSTALL_DIR}/lib64)
19-
203
set(CURL_USE_LIBPSL OFF)
214
set(BUILD_EXAMPLES OFF)
225
FetchContent_Declare(curl
236
GIT_REPOSITORY https://github.com/curl/curl.git
247
GIT_TAG curl-8_12_1
258
)
269

27-
FetchContent_MakeAvailable(curl)
10+
FetchContent_MakeAvailable(curl)

engine/cmake/drogon.cmake

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@ include(FetchContent)
22

33
set(USE_OSSP_UUID TRUE)
44

5-
set(OPENSSL_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/../build_deps/openssl)
6-
set(OPENSSL_INCLUDE_DIR ${OPENSSL_INSTALL_DIR}/include)
7-
set(OPENSSL_ROOT_DIR ${OPENSSL_INSTALL_DIR}/lib)
8-
95
set(ZLIB_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/../build_deps/zlib/install)
106
set(ZLIB_INCLUDE_DIR ${ZLIB_INSTALL_DIR}/include)
117
if(MSVC)

engine/cmake/openssl.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ set(OPENSSL_INCLUDE_DIR ${OPENSSL_INSTALL_DIR}/include)
2323

2424
set(OPENSSL_CONFIGURE_COMMAND ${OPENSSL_SOURCE_DIR}/config)
2525
if(MSVC)
26-
Externoject_Add(
26+
ExternalProject_Add(
2727
SOURCE_DIR ${OPENSSL_SOURCE_DIR}
2828
GIT_REPOSITORY https://github.com/openssl/openssl.git
2929
GIT_TAG openssl-3.4.1
@@ -67,4 +67,4 @@ add_dependencies(OpenSSL::SSL OpenSSL)
6767
add_library(OpenSSL::Crypto STATIC IMPORTED GLOBAL)
6868
set_property(TARGET OpenSSL::Crypto PROPERTY IMPORTED_LOCATION ${OPENSSL_INSTALL_DIR}/lib64/libcrypto.${OPENSSL_LIBRARY_SUFFIX})
6969
set_property(TARGET OpenSSL::Crypto PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${OPENSSL_INCLUDE_DIR})
70-
add_dependencies(OpenSSL::Crypto OpenSSL)
70+
add_dependencies(OpenSSL::Crypto OpenSSL)

0 commit comments

Comments
 (0)