github pipeline fix cmake config

laudominik · Jun 24, 2024 · 4f228ae · 4f228ae
1 parent c74d37a
commit 4f228ae
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 19 deletions.
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -18,25 +18,11 @@ jobs:
     steps:
     - uses: actions/checkout@v4
 
-    - name: Cache Boost
-      id: cache-boost
-      uses: actions/cache@v3
-      with:
-        path: ${{env.BOOST_PATH}}
-        key: boost-${{env.BOOST_VERSION}}
-
-    - name: Install Boost
-      uses: MarkusJx/install-boost@v2.4.4
-      id: install-boost
-      with:
-         boost_version: ${{env.BOOST_VERSION}}
-         cache: true
-
     - name: Configure CMake
-      run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
+      run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DGLFW_BUILD_WAYLAND=OFF -DGLFW_BUILD_X11=OFF
 
     - name: Build
-      run: cmake --build ${{github.workspace}}/build --target emulator_test --config ${{env.BUILD_TYPE}}
+      run: cmake --build ${{github.workspace}}/build --target engine_test --config ${{env.BUILD_TYPE}}
 
     - name: Run unit tests
       working-directory: ${{github.workspace}}/build

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -15,7 +15,6 @@ FetchContent_Declare(
 FetchContent_GetProperties(glfw)
 if(NOT glfw_POPULATED)
     FetchContent_Populate(glfw)
-
     set(GLFW_BUILD_EXAMPLES OFF CACHE INTERNAL "Build the GLFW example programs")
     set(GLFW_BUILD_TESTS OFF CACHE INTERNAL "Build the GLFW test programs")
     set(GLFW_BUILD_DOCS OFF CACHE INTERNAL "Build the GLFW documentation")
@@ -85,7 +84,7 @@ if(NOT stb_POPULATED)
     target_include_directories(stb INTERFACE ${stb_SOURCE_DIR})
 endif()
 
-set(BOOST_INCLUDE_LIBRARIES thread filesystem system program_options)
+set(BOOST_INCLUDE_LIBRARIES thread filesystem system program_options range)
 set(BOOST_ENABLE_CMAKE ON)
 
 message("Downloading Boost")

diff --git a/src/tricore/CMakeLists.txt b/src/tricore/CMakeLists.txt
@@ -5,4 +5,4 @@ file(GLOB_RECURSE TRICORE_SOURCES
 )
 
 target_sources(tricore PUBLIC ${TRICORE_SOURCES})
-target_link_libraries(tricore PUBLIC glad triutil fmt glm glfw stb Boost::filesystem)
+target_link_libraries(tricore PUBLIC glad triutil fmt glm glfw stb Boost::filesystem Boost::range Boost::algorithm)