build: Arch specific gsl (#2008)

Co-authored-by: Adam Washington <[email protected]>

.github/workflows/build/osx/action.yml

@@ -96,7 +96,7 @@ runs:
 
       # Build
       mkdir build && cd build
-      cmake -G Ninja -DGUI:bool=true -DMULTI_THREADING:bool=${{ inputs.threading }} -DJava_JAVA_EXECUTABLE:path=${JAVA_RUNTIME} -DANTLR_EXECUTABLE:string=$ANTLR_EXE -DQT_BASE_DIR=$QT_BASE_DIR ../
+      cmake -G Ninja -DGUI:bool=true -DMULTI_THREADING:bool=${{ inputs.threading }} -DCONAN_GSL="OFF" -DJava_JAVA_EXECUTABLE:path=${JAVA_RUNTIME} -DANTLR_EXECUTABLE:string=$ANTLR_EXE -DQT_BASE_DIR=$QT_BASE_DIR ../
       cmake --build . --config Release
 
       # Copy over ftgl libs so we can ship them with the bundle

.github/workflows/setup/action.yml

@@ -55,7 +55,7 @@ runs:
     - name: Install Dependencies (OSX)
       if: ${{ runner.os == 'macos' }}
       shell: bash
-      run: brew install coreutils gawk
+      run: brew install coreutils gawk gsl
 
     - name: Get nix hash
       shell: bash

CMakeLists.txt

@@ -26,9 +26,15 @@ set(CMAKE_CXX_STANDARD 17)
 # Add our custom module search path
 list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/Modules")
 
+# Install GSL (GNU Scientific Library) with Conan for Windows and Unix-like systems
+option(CONAN_GSL "Use conan to find GSL" ON)
+
 # Include Conan Packages
 option(CONAN "Use conan to find dependencies" ON)
 if(CONAN)
+  if(CONAN_GSL)
+    list(APPEND EXTRA_CONAN_REQUIRES gsl/2.7.1)
+  endif(CONAN_GSL)
   # Add local dirs to cmake Module search path
   list(APPEND CMAKE_MODULE_PATH ${CMAKE_BINARY_DIR})
   list(APPEND CMAKE_PREFIX_PATH ${CMAKE_BINARY_DIR})
@@ -52,6 +58,9 @@ include_directories(${toml11_INCLUDE_DIRS})
 find_package(pugixml REQUIRED)
 include_directories(${pugixml_INCLUDE_DIRS})
 list(APPEND CORE_LINK_LIBS "pugixml::pugixml")
+find_package(GSL REQUIRED)
+set(GSL_LIBS GSL::gsl GSL::gslcblas)
+list(APPEND CORE_LINK_LIBS ${GSL_LIBS})
 
 # For the Antlr runtime we need to do a bit more work since the cmake lib descriptions that get generated by Conan / Nix / other are not
 # very consistent with their variable naming...

flake.nix

@@ -33,6 +33,7 @@
           fmt_8
           fmt_8.dev
           freetype
+          gsl
           inetutils # for rsh
           ninja
           jre