Skip to content

Commit

Permalink
💚 Fix building process bug
Browse files Browse the repository at this point in the history
  • Loading branch information
ldslds449 committed Apr 4, 2024
1 parent 59265f3 commit 36d8757
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ target_compile_definitions(${TARGET_NAME} PUBLIC "PROTOCOL_VERSION=${PROTOCOL_VE
target_compile_options(${TARGET_NAME} PUBLIC $<$<AND:$<CONFIG:Debug>,$<BOOL:${ASAN}>>:/fsanitize=address>)
target_link_libraries(${TARGET_NAME}
$<$<PLATFORM_ID:Windows>:ws2_32>
$<$<PLATFORM_ID:Linux>:pthread>
$<$<OR:$<PLATFORM_ID:Linux>,$<PLATFORM_ID:Darwin>>:pthread>
botcraft$<$<CONFIG:Debug>:_d>
protocolCraft$<$<CONFIG:Debug>:_d>)

Expand Down
2 changes: 1 addition & 1 deletion cmake/botcraft.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ include_directories(${BOTCRAFT_HEADER_PATH})

if(WIN32)
link_directories(${BOTCRAFT_LIB_PATH})
elseif(LINUX)
elseif(LINUX OR APPLE)
link_directories(${BOTCRAFT_BINARY_PATH})
endif()

Expand Down
4 changes: 2 additions & 2 deletions cmake/dpp.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ if(NOT EXISTS "${DPP_SRC_PATH}/.git")
endif()


if(LINUX)
if(LINUX OR APPLE)
# Dpp need zlib and openssl in Linux
find_package(ZLIB QUIET)
find_package(OpenSSL QUIET)
Expand Down Expand Up @@ -65,7 +65,7 @@ if(WIN32)
message(STATUS "DPP Version: " ${dpp_subfolder})
include_directories(${DPP_HEADER_PATH}/${dpp_subfolder})
link_directories(${DPP_LIB_PATH}/${dpp_subfolder})
elseif(LINUX)
elseif(LINUX OR APPLE)
include_directories(${DPP_HEADER_PATH})
link_directories(${DPP_LIB_PATH})
endif()
Expand Down

0 comments on commit 36d8757

Please sign in to comment.