Skip to content

Commit 7f52bf6

Browse files
committed
👷 Fixed CI build
1 parent 7ae8538 commit 7f52bf6

File tree

3 files changed

+20
-4
lines changed

3 files changed

+20
-4
lines changed

.github/workflows/build.yml

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,24 @@ jobs:
1717
- name: Enable Developer Command Prompt
1818
uses: ilammy/msvc-dev-cmd@v1.10.0
1919

20-
- name: Get latest CMake and ninja
21-
uses: lukka/get-cmake@latest
20+
- name: Install deps (Ubuntu)
21+
if: startsWith(matrix.os, 'ubuntu')
22+
run: sudo apt-get update && sudo apt-get -y install libpoco-dev ninja-build
23+
24+
- run: echo "C:\apps\build-tools\" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
25+
if: startsWith(matrix.os, 'windows')
26+
27+
- name: Install Build tools
28+
if: startsWith(matrix.os, 'windows')
29+
shell: cmake -P {0}
30+
run: |
31+
file(MAKE_DIRECTORY "C:/apps/build-tools/")
32+
file(DOWNLOAD https://cdn.anotherfoxguy.com/build-tools.zip "$ENV{TMP}/build-tools.zip" SHOW_PROGRESS)
33+
execute_process(COMMAND ${CMAKE_COMMAND} -E tar xzf "$ENV{TMP}/build-tools.zip" WORKING_DIRECTORY "C:/apps/build-tools/")
34+
35+
- name: Install deps with conan
36+
if: startsWith(matrix.os, 'windows')
37+
run: conan install ..
2238

2339
- name: Configure
2440
run: cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DRORSERVER_WITH_ANGELSCRIPT=ON .

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} ${CMAKE_BINARY_DIR})
66
project(rorserver)
77

88

9-
find_package(Poco REQUIRED)
9+
find_package(Poco REQUIRED COMPONENTS Foundation)
1010

1111
# setup paths
1212
SET(RUNTIME_OUTPUT_DIRECTORY "${rorserver_SOURCE_DIR}/bin/")

source/server/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ target_include_directories(${PROJECT_NAME} PRIVATE
1111
${CMAKE_SOURCE_DIR}/dependencies/jsoncpp/include/
1212
)
1313

14-
target_link_libraries(${PROJECT_NAME} PRIVATE Poco::Poco)
14+
target_link_libraries(${PROJECT_NAME} PRIVATE Poco::Foundation)
1515

1616
# libraries
1717
if (RORSERVER_WITH_ANGELSCRIPT)

0 commit comments

Comments
 (0)