mirror of
https://github.com/etlegacy/etlegacy-libs.git
synced 2025-04-09 16:05:00 +00:00
cmake: import some code from master branch
This commit is contained in:
parent
f3371620e6
commit
806349f24e
1 changed files with 8 additions and 1 deletions
|
@ -374,6 +374,13 @@ if (FEATURE_SSL AND BUNDLED_OPENSSL AND (BUILD_CLIENT OR BUILD_SERVER))
|
|||
|
||||
set(OPENSSL_BUNDLED_LIBRARY "${LIBS_BINARY_DIR}/openssl/${openssl_lib_folder}/libssl.a" "${LIBS_BINARY_DIR}/openssl/${openssl_lib_folder}/libcrypto.a")
|
||||
|
||||
if(CMAKE_CROSSCOMPILING AND CMAKE_C_COMPILER_ID STREQUAL "GNU")
|
||||
string(REGEX REPLACE "gcc$" "" COMPILER_PREFIX "${CMAKE_C_COMPILER}")
|
||||
if(COMPILER_PREFIX)
|
||||
SET(OPENSSL_BUILD ${OPENSSL_BUILD} --cross-compile-prefix=${COMPILER_PREFIX})
|
||||
endif()
|
||||
endif()
|
||||
|
||||
# FIXME:
|
||||
# check all the locations of the files (runtime files?!)
|
||||
# and enable ssl in CURL
|
||||
|
@ -853,7 +860,7 @@ if(BUNDLED_LUA AND BUILD_MOD)
|
|||
add_library(bundled_lua_int INTERFACE)
|
||||
target_compile_definitions(bundled_lua_int INTERFACE BUNDLED_LUA)
|
||||
|
||||
if (WIN32 OR APPLE)
|
||||
if (WIN32 OR APPLE OR CMAKE_CROSSCOMPILING)
|
||||
set(LUA_LIB "${CMAKE_CURRENT_LIST_DIR}/lua/src")
|
||||
|
||||
FILE(GLOB LUA_LIB_SRC ${LUA_LIB}/*.c)
|
||||
|
|
Loading…
Reference in a new issue