Skip to content

Commit 69c27b7

Browse files
authored
Merge pull request #138 from NuiCpp/feat/boost_1_89_0
Feat/boost 1 89 0
2 parents 94fd0df + 15e55f9 commit 69c27b7

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

.github/workflows/ubuntu.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ jobs:
2626
- uses: actions/checkout@v3
2727
- uses: awalsh128/cache-apt-pkgs-action@latest
2828
with:
29-
# clang uses libtinfo, which apparently is in ncurses?
30-
packages: libwebkit2gtk-4.1-dev ncurses libcurl4-openssl-dev libcrypto++-dev ninja-build
29+
packages: libwebkit2gtk-4.1-dev libcurl4-openssl-dev libcrypto++-dev ninja-build # clang uses libtinfo, which apparently is in ncurses?
30+
version: 1.0
3131

3232
- name: Install boost
3333
uses: MarkusJx/[email protected]

cmake/dependencies/boost.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
if (CMAKE_VERSION VERSION_LESS "3.30")
2-
find_package(Boost 1.81.0 REQUIRED COMPONENTS system iostreams)
2+
find_package(Boost 1.81.0 REQUIRED COMPONENTS iostreams)
33
else()
4-
find_package(Boost CONFIG 1.81.0 REQUIRED COMPONENTS system iostreams)
4+
find_package(Boost CONFIG 1.81.0 REQUIRED COMPONENTS iostreams)
55
endif()

cmake/dependencies/roar.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
option(NUI_FETCH_ROAR "Fetch roar" ON)
22
set(NUI_ROAR_REPOSITORY "https://github.com/5cript/roar.git" CACHE STRING "roar repository")
3-
set(NUI_ROAR_TAG "515d2a963171b88746eb3f1b1b5abd20823d2c4d" CACHE STRING "roar tag")
3+
set(NUI_ROAR_TAG "f5097297da9efa7b539271e631cc9d3c05369045" CACHE STRING "roar tag")
44

55
if(NUI_FETCH_ROAR)
66
include(FetchContent)

nui/src/nui/backend/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ target_include_directories(
2424
)
2525
nui_set_project_warnings(nui-backend)
2626

27-
find_package(Boost CONFIG 1.80.0 REQUIRED COMPONENTS system)
27+
include("${CMAKE_CURRENT_LIST_DIR}/../../../../cmake/dependencies/boost.cmake")
2828

2929
target_link_libraries(
3030
nui-backend

0 commit comments

Comments
 (0)