Skip to content

Commit 2109e61

Browse files
committed
Fix build.
1 parent ce4b74e commit 2109e61

3 files changed

Lines changed: 6 additions & 5 deletions

File tree

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747

4848
env:
4949
ci_platform: windows
50-
ci_target_sdk_name: rebelfork-sdk-Windows-msvc-rel-dll-x64-latest.zip
50+
ci_target_sdk_name: rebelfork-sdk-Windows-msvc-dll-x64-latest.zip
5151
ci_upload_release: ${{
5252
(github.repository == 'rbfx/Core.SamplePlugin') &&
5353
(github.ref == 'refs/heads/master')

CMakeLists.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,7 @@ project (Plugin.Core.SamplePlugin)
55
# If the plugin is only built as subdirectory, this snippet is not needed and may be discarded.
66
if (PROJECT_IS_TOP_LEVEL)
77
set (CMAKE_CXX_STANDARD 17)
8-
set (REBELFORK_SDK "" CACHE STRING "Path to pre-built SDK")
9-
set (CMAKE_PREFIX_PATH ${REBELFORK_SDK}/share)
108
find_package (Urho3D REQUIRED)
11-
include (${REBELFORK_SDK}/share/CMake/Modules/UrhoCommon.cmake)
129
endif ()
1310

1411
file (GLOB SOURCE_FILES *.h *.cpp)

ci_build.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ function action-generate() {
3333
"$ci_build_dir"
3434
"-S"
3535
"$ci_source_dir"
36-
"-DREBELFORK_SDK=$ci_target_sdk_dir"
3736
)
3837

3938
if [[ "$ci_platform" == "windows" ]]; then
@@ -43,6 +42,11 @@ function action-generate() {
4342
"-A"
4443
"x64"
4544
"-DCMAKE_BUILD_TYPE=${build_config[$ci_platform]}"
45+
"-DCMAKE_PREFIX_PATH=$ci_target_sdk_dir/share"
46+
)
47+
else
48+
params+=(
49+
"-DCMAKE_PREFIX_PATH=$ci_target_sdk_dir"
4650
)
4751
fi
4852

0 commit comments

Comments
 (0)