Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2025-11-04 06:32:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

revert bcrypt compilation changes

Browse Source
This commit is contained in:
jadebenn
2024-11-26 23:26:16 -06:00
parent 8cd951d6c7
commit ee40d98fb1
1 changed files with 15 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
thirdparty/CMakeLists.txt vendored
View File

@@ -2,40 +2,29 @@
# add_subdirectory(recastnavigation)
# Source Code for libbcrypt. Uses a file glob instead to get around Windows build issues.
# file(
# GLOB SOURCES_LIBBCRYPT
# LIST_DIRECTORIES false
# RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}"
# ${CMAKE_CURRENT_SOURCE_DIR}/libbcrypt/src/*.c
# )
file(
GLOB SOURCES_LIBBCRYPT
LIST_DIRECTORIES false
RELATIVE "${DLU_THIRDPARTY_SOURCE_DIR}"
${DLU_THIRDPARTY_SOURCE_DIR}/libbcrypt/src/*.c
)
# add_library(bcrypt ${SOURCES_LIBBCRYPT})
FetchContent_MakeAvailable(bcrypt)
# Fix BCrypt header includes
get_target_property(BCRYPT_INCLUDES bcrypt INCLUDE_DIRECTORIES)
message(STATUS "BYCRPT_INCLUDES = ${BCRYPT_INCLUDES}")
target_include_directories(bcrypt INTERFACE ${BCRYPT_INCLUDES})
cmake_print_properties(TARGETS bcrypt PROPERTIES
PUBLIC_HEADER
INCLUDE_DIRECTORIES
INTERFACE_INCLUDE_DIRECTORIES)
add_library(bcrypt ${SOURCES_LIBBCRYPT})
# Because we are not using the libbcrypt CMakeLists.txt, we need to include these headers for the library to use.
# fortunately they are only needed for building the libbcrypt directory and nothing else, so these are marked private.
# if(NOT WIN32)
# target_include_directories(bcrypt PRIVATE "libbcrypt/include/bcrypt")
# endif()
if(NOT WIN32)
target_include_directories(bcrypt PRIVATE "libbcrypt/include/bcrypt")
endif()
# Need to define this on Clang and GNU for 'strdup' support
# if(CMAKE_CXX_COMPILER_ID MATCHES "Clang|GNU")
# target_compile_definitions(bcrypt PRIVATE "_POSIX_C_SOURCE=200809L")
# endif()
if(CMAKE_CXX_COMPILER_ID MATCHES "Clang|GNU")
target_compile_definitions(bcrypt PRIVATE "_POSIX_C_SOURCE=200809L")
endif()
# target_include_directories(bcrypt INTERFACE "libbcrypt/include")
# target_include_directories(bcrypt PRIVATE "libbcrypt/src")
target_include_directories(bcrypt INTERFACE "libbcrypt/include")
target_include_directories(bcrypt PRIVATE "libbcrypt/src")
# Source code for sqlite
add_subdirectory(SQLite)