Merge branch 'master' into develop

jacmie · Nov 16, 2024 · 2299417 · 2299417
2 parents 77cd3d6 + 3d43ea2
commit 2299417
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/.github/workflows/os_compile_and_test.yml b/.github/workflows/os_compile_and_test.yml
@@ -71,6 +71,7 @@ jobs:
           sudo apt install libxft-dev
           sudo apt install libxinerama-dev
           sudo apt install libgl1-mesa-dev
+          sudo apt install libglu1-mesa-dev
 
       # MacOS
       - name: Set MacOS
@@ -103,7 +104,7 @@ jobs:
         uses: ilammy/msvc-dev-cmd@v1
         with:
           arch: x86_64
-          vsversion: 17.0
+          #vsversion: 17.0
 
       # Submodules update
       - name: Pull & update submodules recursively

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -103,12 +103,9 @@ set(USE_GL ON CACHE BOOL "Build parts of the liballPurpose dependent on the Open
 set(INCLUDE_DIR_GL   "/usr/local/include"   CACHE PATH "GL library header files directory.")
 set(LIBRARY_DIR_GL   "/usr/local/lib"       CACHE PATH "GL library binaries directory.")
 
-if(LINUX)
+if(UNIX)
     set(INCLUDE_DIR_FLTK        "${CMAKE_SOURCE_DIR}/extern/fltk/build/install/include"    CACHE PATH "FLTK library header files directory.")
     set(PACKAGE_CONFIG_DIR_FLTK	"${CMAKE_SOURCE_DIR}/extern/fltk/build/install/share/fltk" CACHE PATH "FLTK library binaries directory.")
-elseif(APPLE)
-    set(INCLUDE_DIR_FLTK        "${CMAKE_SOURCE_DIR}/extern/fltk/build/install/include"    CACHE PATH "FLTK library header files directory.")
-	set(PACKAGE_CONFIG_DIR_FLTK	"${CMAKE_SOURCE_DIR}/extern/fltk/build/install/FLTK.framework/Resources/CMake" CACHE PATH "FLTK library binaries directory.")
 elseif(WIN32)
     set(INCLUDE_DIR_FLTK        "${CMAKE_SOURCE_DIR}/extern/fltk/build/install/include"    CACHE PATH "FLTK library header files directory.")
     set(PACKAGE_CONFIG_DIR_FLTK	"${CMAKE_SOURCE_DIR}/extern/fltk/build/install/CMake"      CACHE PATH "FLTK library CMake configuration directory.")