Skip to content

Commit bbe5133

Browse files
committed
ci: convert Windows paths to unix paths
1 parent c7e0740 commit bbe5133

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

.github/workflows/main.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,9 @@ jobs:
107107
if: "! matrix.platform.cmake"
108108
run: |
109109
set -eu
110+
if [ "x${{ runner.os }}" = "xWindows" ]; then
111+
export PKG_CONFIG_PATH="$( cygpath -u "${{ steps.sdl.outputs.prefix }}/lib/pkgconfig" ):$PKG_CONFIG_PATH"
112+
fi
110113
rm -fr build-autotools
111114
mkdir build-autotools
112115
./autogen.sh

cmake/test/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@ if(TEST_SHARED)
2121
find_package(SDL3 CONFIG REQUIRED COMPONENTS SDL3)
2222
find_package(SDL2_net REQUIRED CONFIG)
2323
add_executable(main_shared main.c)
24-
target_link_libraries(main_shared PRIVATE SDL3::SDL3 SDL2_net::SDL2_net)
24+
target_link_libraries(main_shared PRIVATE SDL2_net::SDL2_net SDL3::SDL3)
2525
endif()
2626

2727
if(TEST_STATIC)
2828
# FIXME: in the distant future, must become REQUIRED
2929
find_package(SDL3 CONFIG REQUIRED COMPONENTS SDL3)
3030
find_package(SDL2_net REQUIRED CONFIG)
3131
add_executable(main_static main.c)
32-
target_link_libraries(main_static PRIVATE SDL3::SDL3 SDL2_net::SDL2_net-static)
32+
target_link_libraries(main_static PRIVATE SDL2_net::SDL2_net-static SDL3::SDL3)
3333
endif()
3434

3535
feature_summary(WHAT ALL)

0 commit comments

Comments
 (0)