Skip to content

Commit bce9676

Browse files
fix : cmake link wslay
1 parent 6a13fdb commit bce9676

2 files changed

Lines changed: 5 additions & 3 deletions

File tree

.github/actions/build-library-and-upload/action.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,7 @@ runs:
1616
- id: build
1717
run: |
1818
rm -rf out
19-
triplet=$(grep -E '^VCPKG_TARGET_TRIPLET:STRING=' build/${{ inputs.preset }}/CMakeCache.txt | cut -d= -f2)
20-
cmake --preset ${{ inputs.preset }} -DBUILD_SHARED_LIBS=ON \
21-
-DCMAKE_CXX_FLAGS="-I${PWD}/build/${{ inputs.preset }}/vcpkg_installed/${triplet}/include"
19+
cmake --preset ${{ inputs.preset }} -DBUILD_SHARED_LIBS=ON
2220
cmake --build ./build/${{ inputs.preset }} --config ${{ inputs.build-type }} --verbose
2321
cmake --install ./build/${{ inputs.preset }} --config ${{ inputs.build-type }}
2422
working-directory: ${{ inputs.nakama-cpp-path }}

factory/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ target_compile_definitions(nakama-sdk-client-factory PRIVATE
99
$<$<BOOL:${WITH_HTTP_LIBHTTPC}>:WITH_HTTP_LIBHTTPC>
1010
$<$<BOOL:${WITH_HTTP_CPPREST}>:WITH_HTTP_CPPREST>
1111
)
12+
if (WITH_WS_WSLAY)
13+
find_package(wslay CONFIG REQUIRED)
14+
target_link_libraries(nakama-sdk-rtclient-factory PRIVATE wslay::wslay)
15+
endif()
1216

1317
add_library(nakama-sdk-rtclient-factory OBJECT NWebsocketsFactory.cpp)
1418
add_library(nakama::sdk-rtclient-factory ALIAS nakama-sdk-rtclient-factory)

0 commit comments

Comments
 (0)