Hopefully fixed the workers to use the right library

ioan-chera · Jul 28, 2024 · ef2ce1b · ef2ce1b
1 parent 2e7f4c3
commit ef2ce1b
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 7 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -64,7 +64,7 @@ jobs:
     #   If the Autobuild fails above, remove it and uncomment the following three lines. 
     #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
 
-    - run: sudo apt-get update && sudo apt-get install --fix-missing cmake libfltk1.3-dev libxpm-dev libz-dev python3 && mkdir build && cd build && cmake .. && make -j$(nproc)
+    - run: sudo apt-get update && sudo apt-get install --fix-missing cmake libjpeg-dev libpng-dev libxpm-dev libz-dev python3 && mkdir build && cd build && cmake .. && make -j$(nproc)
 
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v2

diff --git a/.github/workflows/ubuntu-compile-clang.yml b/.github/workflows/ubuntu-compile-clang.yml
@@ -14,7 +14,7 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Install Dependencies
-      run: sudo apt-get update && sudo apt-get install --fix-missing clang cmake libfltk1.3-dev libxpm-dev libz-dev python3
+      run: sudo apt-get update && sudo apt-get install --fix-missing clang cmake libjpeg-dev libpng-dev libxpm-dev libz-dev python3
     - name: CMake
       run: export CC=/usr/bin/clang && export CXX=/usr/bin/clang++ && mkdir build-clang && cd build-clang && cmake .. && make -j$(nproc)
     - name: Test

diff --git a/.github/workflows/ubuntu-compile-clang24.yml b/.github/workflows/ubuntu-compile-clang24.yml
@@ -14,7 +14,7 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Install Dependencies
-      run: sudo apt-get update && sudo apt-get install --fix-missing clang cmake libfltk1.3-dev libxpm-dev libz-dev python3
+      run: sudo apt-get update && sudo apt-get install --fix-missing clang cmake libjpeg-dev libpng-dev libxpm-dev libz-dev python3
     - name: CMake
       run: export CC=/usr/bin/clang && export CXX=/usr/bin/clang++ && mkdir build-clang && cd build-clang && cmake .. && make -j$(nproc)
     - name: Test

diff --git a/.github/workflows/ubuntu-compile.yml b/.github/workflows/ubuntu-compile.yml
@@ -14,7 +14,7 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Install Dependencies
-      run: sudo apt-get update && sudo apt-get install --fix-missing cmake libfltk1.3-dev libxpm-dev libz-dev python3
+      run: sudo apt-get update && sudo apt-get install --fix-missing cmake libjpeg-dev libpng-dev libxpm-dev libz-dev python3
     - name: CMake
       run: mkdir build && cd build && cmake .. && make -j$(nproc)
     - name: Test

diff --git a/.github/workflows/ubuntu-compile24.yml b/.github/workflows/ubuntu-compile24.yml
@@ -14,7 +14,7 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Install Dependencies
-      run: sudo apt-get update && sudo apt-get install --fix-missing cmake libfltk1.3-dev libxpm-dev libz-dev python3
+      run: sudo apt-get update && sudo apt-get install --fix-missing cmake libjpeg-dev libpng-dev libxpm-dev libz-dev python3
     - name: CMake
       run: mkdir build && cd build && cmake .. && make -j$(nproc)
     - name: Test

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -259,7 +259,7 @@ target_include_directories(
 target_link_libraries(
     eurekasrc
     PRIVATE
-    fltk fltk_gl fltk_images fltk_jpeg fltk_png fltk_z
+    fltk fltk_gl fltk_images
 )
 
 if(APPLE)
@@ -279,7 +279,20 @@ if(UNIX AND NOT APPLE)
     find_package(ZLIB REQUIRED) # ZLIB is expected on Linux separately from FLTK
     find_package(JPEG REQUIRED)
     find_package(PNG REQUIRED)
-    target_link_libraries(eurekasrc PUBLIC ${X11_Xpm_LIB} ${ZLIB_LIBRARIES} ${JPEG_LIBRARIES} ${PNG_LIBRARIES})
+    target_link_libraries(
+        eurekasrc 
+        PUBLIC 
+        ${X11_Xpm_LIB} 
+        ${ZLIB_LIBRARIES} 
+        ${JPEG_LIBRARIES} 
+        ${PNG_LIBRARIES}
+    )
+else()
+    target_link_libraries(
+        eurekasrc
+        PRIVATE
+        fltk_jpeg fltk_png fltk_z
+    )
 endif()
 
 target_link_libraries(eurekasrc PUBLIC ${OPENGL_LIBRARIES})