Merge pull request #37 from ucsd-cse125-sp24/ci-opengl

ucsd-cse125-sp24 · Apr 20, 2024 · 6470d74 · 6470d74
2 parents 48e721e + 3674fc6
commit 6470d74
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -24,7 +24,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Install OpenGL
-      run: sudo apt-get update && sudo apt-get install cmake pkg-config && sudo apt-get install mesa-utils libglu1-mesa-dev freeglut3-dev mesa-common-dev && sudo apt-get install libglew-dev libglfw3-dev libglm-dev && sudo apt-get install libao-dev libmpg123-dev
+      run: sudo apt-get update && sudo apt-get install --fix-missing cmake pkg-config mesa-utils libgl1-mesa-dev libglu1-mesa-dev freeglut3-dev mesa-common-dev libglew-dev libglfw3-dev libglm-dev libao-dev libmpg123-dev libxkbcommon-dev libxinerama-dev libxcursor-dev libxi-dev xvfb
     - uses: actions/checkout@v4
     - name: Create build dir
       run: mkdir -p build
@@ -49,7 +49,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Install OpenGL
-      run: sudo apt-get update && sudo apt-get install cmake pkg-config && sudo apt-get install mesa-utils libglu1-mesa-dev freeglut3-dev mesa-common-dev && sudo apt-get install libglew-dev libglfw3-dev libglm-dev && sudo apt-get install libao-dev libmpg123-dev
+      run: sudo apt-get update && sudo apt-get install --fix-missing cmake pkg-config mesa-utils libgl1-mesa-dev libglu1-mesa-dev freeglut3-dev mesa-common-dev libglew-dev libglfw3-dev libglm-dev libao-dev libmpg123-dev libxkbcommon-dev libxinerama-dev libxcursor-dev libxi-dev xvfb
     - uses: actions/checkout@v4
     - name: Create build dir
       run: mkdir -p build

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -23,6 +23,8 @@ jobs:
     name: Client on Linux (Ubuntu) 
     runs-on: ubuntu-latest
     steps:
+    - name: Install OpenGL
+      run: sudo apt-get update && sudo apt-get install --fix-missing cmake pkg-config mesa-utils libgl1-mesa-dev libglu1-mesa-dev freeglut3-dev mesa-common-dev libglew-dev libglfw3-dev libglm-dev libao-dev libmpg123-dev libxkbcommon-dev libxinerama-dev libxcursor-dev libxi-dev xvfb
     - uses: actions/checkout@v4
     - name: Create build dir
       run: mkdir -p build
@@ -46,6 +48,8 @@ jobs:
     name: Server on Linux (Ubuntu) 
     runs-on: ubuntu-latest
     steps:
+    - name: Install OpenGL
+      run: sudo apt-get update && sudo apt-get install --fix-missing cmake pkg-config mesa-utils libgl1-mesa-dev libglu1-mesa-dev freeglut3-dev mesa-common-dev libglew-dev libglfw3-dev libglm-dev libao-dev libmpg123-dev libxkbcommon-dev libxinerama-dev libxcursor-dev libxi-dev xvfb
     - uses: actions/checkout@v4
     - name: Create build dir
       run: mkdir -p build
@@ -69,6 +73,8 @@ jobs:
     name: Shared on Linux (Ubuntu) 
     runs-on: ubuntu-latest
     steps:
+    - name: Install OpenGL
+      run: sudo apt-get update && sudo apt-get install --fix-missing cmake pkg-config mesa-utils libgl1-mesa-dev libglu1-mesa-dev freeglut3-dev mesa-common-dev libglew-dev libglfw3-dev libglm-dev libao-dev libmpg123-dev libxkbcommon-dev libxinerama-dev libxcursor-dev libxi-dev xvfb
     - uses: actions/checkout@v4
     - name: Create build dir
       run: mkdir -p build

diff --git a/src/client/tests/CMakeLists.txt b/src/client/tests/CMakeLists.txt
@@ -21,8 +21,8 @@ target_link_libraries(${TARGET_NAME}
     Boost::serialization
     nlohmann_json::nlohmann_json
 )
-target_include_directories(${TARGET_NAME} PRIVATE ${GLM_LIBRARY_INCLUDES})
-target_link_libraries(${TARGET_NAME} PRIVATE glm::glm)
+target_include_directories(${TARGET_NAME} PRIVATE ${OPENGL_INCLUDE_DIRS} glfw glm ${imgui-directory} "${CMAKE_BINARY_DIR}/_deps/glew-src/include")
+target_link_libraries(${TARGET_NAME} PRIVATE glm glfw libglew_static)
 
 # setup make target
 set(RUN_TESTS_TARGET "run_${TARGET_NAME}")