Merge pull request #64 from NuiCpp/devel

Moved external project include.
NuiCpp · Aug 28, 2023 · d5c2c3b · d5c2c3b
2 parents 3ccbf70 + d61efc7
commit d5c2c3b
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 3 deletions.
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
@@ -49,6 +49,40 @@ jobs:
     # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
     # run: ctest -C ${{env.BUILD_TYPE}}
 
+  ubuntu20:
+    runs-on: ubuntu-20.04
+
+    steps:
+      - uses: actions/checkout@v3
+      - uses: awalsh128/cache-apt-pkgs-action@v1.3.0
+        with:
+          packages: libwebkit2gtk-4.0-dev libcurl4-openssl-dev libcrypto++-dev ninja-build
+
+      - name: Install boost
+        uses: MarkusJx/install-boost@v2.4.1
+        id: install-boost
+        with:
+          # REQUIRED: Specify the required boost version
+          # A list of supported versions can be found here:
+          # https://github.com/MarkusJx/prebuilt-boost/blob/main/versions-manifest.json
+          boost_version: 1.81.0
+          # OPTIONAL: Specify a platform version
+          platform_version: 20.04
+
+      - name: Setup clang
+        uses: egor-tensin/setup-clang@v1
+        with:
+          version: 15
+          platform: x64
+
+      - name: Configure CMake
+        run: cmake -B ${{github.workspace}}/build/clang_${{env.BUILD_TYPE}} -G"Ninja" -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DNUI_BUILD_EXAMPLES=off -DCMAKE_CXX_EXTENSIONS=on -DCMAKE_CXX_COMPILER=c++ -DCMAKE_C_COMPILER=cc -DCMAKE_CXX_STANDARD=20
+        env:
+          BOOST_ROOT: ${{ steps.install-boost.outputs.BOOST_ROOT }}
+
+      - name: Build
+        run: cmake --build ${{github.workspace}}/build/clang_${{env.BUILD_TYPE}} --config ${{env.BUILD_TYPE}}
+
   windows-msys2:
     runs-on: windows-2022
     defaults:

diff --git a/cmake/backend/emscripten.cmake b/cmake/backend/emscripten.cmake
@@ -1,7 +1,5 @@
 project(emscripten-git NONE)
 
-include(ExternalProject)
-
 if(UNIX)
     add_custom_command(
         OUTPUT "${CMAKE_BINARY_DIR}/_deps/emscripten-src/upstream/emscripten/.emscripten"
@@ -74,6 +72,7 @@ function(nui_add_emscripten_target)
         set(ENABLE_BIN2HPP "yes")
     endif()
 
+    include(ExternalProject)
     ExternalProject_Add(
         "${NUI_ADD_EMSCRIPTEN_TARGET_ARGS_TARGET}-emscripten"
         SOURCE_DIR "${SOURCE_DIR}"

diff --git a/cmake/dependencies/roar.cmake b/cmake/dependencies/roar.cmake
@@ -1,6 +1,6 @@
 option(NUI_FETCH_ROAR "Fetch roar" ON)
 set(NUI_ROAR_REPOSITORY "https://github.com/5cript/roar.git" CACHE STRING "roar repository")
-set(NUI_ROAR_TAG "3c9fdde93d0f70f0d0dd32c68f10587ef43dce9d" CACHE STRING "roar tag")
+set(NUI_ROAR_TAG "0320c15c7b6b25b51eb17c4ee782d0de23acf697" CACHE STRING "roar tag")
 
 if(NUI_FETCH_ROAR)
     include(FetchContent)